Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-7737: Guard against empty binary docvalues

This commit is contained in:
Alan Woodward 2017-07-17 21:38:55 +01:00
parent 3bd1115964
commit 6fcc7cd731
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lucene/spatial-extras/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java
View File

@ -26,6 +26,7 @@ import java.io.IOException;
import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.BinaryDocValuesField;
import org.apache.lucene.document.Field; import org.apache.lucene.document.Field;
import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.ConstantScoreScorer; import org.apache.lucene.search.ConstantScoreScorer;
import org.apache.lucene.search.ConstantScoreWeight; import org.apache.lucene.search.ConstantScoreWeight;
@ -163,7 +164,7 @@ public class SerializedDVStrategy extends SpatialStrategy {
}//PredicateValueSourceQuery }//PredicateValueSourceQuery
/** /**
* Implements a ValueSource by deserializing a Shape in from BinaryDocValues using BinaryCodec. * Implements a ShapeValueSource by deserializing a Shape from BinaryDocValues using BinaryCodec.
* @see #makeShapeValueSource() * @see #makeShapeValueSource()
*/ */
static class ShapeDocValueSource extends ShapeValuesSource { static class ShapeDocValueSource extends ShapeValuesSource {
@ -178,7 +179,7 @@ public class SerializedDVStrategy extends SpatialStrategy {
@Override @Override
public ShapeValues getValues(LeafReaderContext readerContext) throws IOException { public ShapeValues getValues(LeafReaderContext readerContext) throws IOException {
final BinaryDocValues docValues = readerContext.reader().getBinaryDocValues(fieldName); final BinaryDocValues docValues = DocValues.getBinary(readerContext.reader(), fieldName);
return new ShapeValues() { return new ShapeValues() {
@Override @Override