honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-04-05 23:08:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mapping: Fix NPE with scaled floats stats when field is not indexed (#23528)

Browse Source 
This fixes an NPE in finding scaled float stats. The type of min/max
methods on the wrapped long stats returns a boxed type, but in the case
this is null, the unbox done for the FieldStats.Double ctor primitive
types will cause the NPE. These methods would have null for min/max when
the field exists, but does not actually have points values.

fixes #23487
This commit is contained in:
Ryan Ernst 2017-03-15 15:14:32 -07:00 committed by GitHub
parent f7b8128f92
commit d808e751f4
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java
View File

@ -265,11 +265,16 @@ public class ScaledFloatFieldMapper extends FieldMapper {
if (stats == null) { if (stats == null) {
return null; return null;
} }
return new FieldStats.Double(stats.getMaxDoc(), stats.getDocCount(), if (stats.hasMinMax()) {
return new FieldStats.Double(stats.getMaxDoc(), stats.getDocCount(),
stats.getSumDocFreq(), stats.getSumTotalTermFreq(), stats.getSumDocFreq(), stats.getSumTotalTermFreq(),
stats.isSearchable(), stats.isAggregatable(), stats.isSearchable(), stats.isAggregatable(),
stats.getMinValue() == null ? null : stats.getMinValue() / scalingFactor, stats.getMinValue() / scalingFactor,
stats.getMaxValue() == null ? null : stats.getMaxValue() / scalingFactor); stats.getMaxValue() / scalingFactor);
}
return new FieldStats.Double(stats.getMaxDoc(), stats.getDocCount(),
stats.getSumDocFreq(), stats.getSumTotalTermFreq(),
stats.isSearchable(), stats.isAggregatable());
} }
@Override @Override

12
core/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldTypeTests.java
View File

@ -23,6 +23,7 @@ import org.apache.lucene.document.Document;
import org.apache.lucene.document.DoublePoint; import org.apache.lucene.document.DoublePoint;
import org.apache.lucene.document.LongPoint; import org.apache.lucene.document.LongPoint;
import org.apache.lucene.document.SortedNumericDocValuesField; import org.apache.lucene.document.SortedNumericDocValuesField;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig;
@ -143,6 +144,15 @@ public class ScaledFloatFieldTypeTests extends FieldTypeTestCase {
assertNull(ft.stats(reader)); assertNull(ft.stats(reader));
} }
Document doc = new Document(); Document doc = new Document();
doc.add(new StoredField("scaled_float", -1));
w.addDocument(doc);
try (DirectoryReader reader = DirectoryReader.open(w)) {
// field exists, but has no point values
FieldStats<?> stats = ft.stats(reader);
assertFalse(stats.hasMinMax());
assertNull(stats.getMinValue());
assertNull(stats.getMaxValue());
}
LongPoint point = new LongPoint("scaled_float", -1); LongPoint point = new LongPoint("scaled_float", -1);
doc.add(point); doc.add(point);
w.addDocument(doc); w.addDocument(doc);
@ -152,7 +162,7 @@ public class ScaledFloatFieldTypeTests extends FieldTypeTestCase {
FieldStats<?> stats = ft.stats(reader); FieldStats<?> stats = ft.stats(reader);
assertEquals(-1/ft.getScalingFactor(), stats.getMinValue()); assertEquals(-1/ft.getScalingFactor(), stats.getMinValue());
assertEquals(10/ft.getScalingFactor(), stats.getMaxValue()); assertEquals(10/ft.getScalingFactor(), stats.getMaxValue());
assertEquals(2, stats.getMaxDoc()); assertEquals(3, stats.getMaxDoc());
} }
w.deleteAll(); w.deleteAll();
try (DirectoryReader reader = DirectoryReader.open(w)) { try (DirectoryReader reader = DirectoryReader.open(w)) {