You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2017/07/24 02:58:53 UTC
lucene-solr:branch_7_0: LUCENE-7737: Guard against empty binary
docvalues
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7_0 d5c9ed0b9 -> 13449c7a7
LUCENE-7737: Guard against empty binary docvalues
(cherry picked from commit 6fcc7cd)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/13449c7a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/13449c7a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/13449c7a
Branch: refs/heads/branch_7_0
Commit: 13449c7a71002859fe3c427aa62e40ab432ac52e
Parents: d5c9ed0
Author: Alan Woodward <ro...@apache.org>
Authored: Mon Jul 17 16:38:55 2017 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Sun Jul 23 22:58:48 2017 -0400
----------------------------------------------------------------------
.../apache/lucene/spatial/serialized/SerializedDVStrategy.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/13449c7a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java
----------------------------------------------------------------------
diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java
index 3a33380..c036d34 100644
--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java
+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java
@@ -26,6 +26,7 @@ import java.io.IOException;
import org.apache.lucene.document.BinaryDocValuesField;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.BinaryDocValues;
+import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.ConstantScoreScorer;
import org.apache.lucene.search.ConstantScoreWeight;
@@ -163,7 +164,7 @@ public class SerializedDVStrategy extends SpatialStrategy {
}//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()
*/
static class ShapeDocValueSource extends ShapeValuesSource {
@@ -178,7 +179,7 @@ public class SerializedDVStrategy extends SpatialStrategy {
@Override
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() {
@Override