You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2017/04/13 07:43:42 UTC
lucene-solr:master: LUCENE-7783: Fix NPE when getting points on a
non-existing field.
Repository: lucene-solr
Updated Branches:
refs/heads/master 1d7413450 -> 89f6d170f
LUCENE-7783: Fix NPE when getting points on a non-existing field.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/89f6d170
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/89f6d170
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/89f6d170
Branch: refs/heads/master
Commit: 89f6d170f5db176c81980d58ffe21484885eb464
Parents: 1d74134
Author: Adrien Grand <jp...@gmail.com>
Authored: Thu Apr 13 09:43:01 2017 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Thu Apr 13 09:43:01 2017 +0200
----------------------------------------------------------------------
.../org/apache/lucene/index/memory/MemoryIndex.java | 10 +++-------
.../org/apache/lucene/index/memory/TestMemoryIndex.java | 12 ++++++++++++
2 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89f6d170/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
----------------------------------------------------------------------
diff --git a/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java b/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
index 4bd72e9..a1f2b07 100644
--- a/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
+++ b/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
@@ -1217,7 +1217,7 @@ public class MemoryIndex {
@Override
public PointValues getPointValues(String fieldName) {
Info info = fields.get(fieldName);
- if (info.pointValues == null) {
+ if (info == null || info.pointValues == null) {
return null;
}
return new MemoryIndexPointValues(info);
@@ -1529,6 +1529,7 @@ public class MemoryIndex {
MemoryIndexPointValues(Info info) {
this.info = Objects.requireNonNull(info);
+ Objects.requireNonNull(info.pointValues, "Field does not have points");
}
@Override
@@ -1548,12 +1549,7 @@ public class MemoryIndex {
@Override
public byte[] getMinPackedValue() throws IOException {
- BytesRef[] values = info.pointValues;
- if (values != null) {
- return info.minPackedValue;
- } else {
- return null;
- }
+ return info.minPackedValue;
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/89f6d170/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java
----------------------------------------------------------------------
diff --git a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java
index f34f30c..1e20f30 100644
--- a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java
+++ b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java
@@ -40,6 +40,7 @@ import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.SortedNumericDocValuesField;
import org.apache.lucene.document.SortedSetDocValuesField;
+import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.BinaryDocValues;
@@ -422,6 +423,17 @@ public class TestMemoryIndex extends LuceneTestCase {
}
}
+ public void testMissingPoints() throws IOException {
+ Document doc = new Document();
+ doc.add(new StoredField("field", 42));
+ MemoryIndex mi = MemoryIndex.fromDocument(doc, analyzer);
+ IndexSearcher indexSearcher = mi.createSearcher();
+ // field that exists but does not have points
+ assertNull(indexSearcher.getIndexReader().leaves().get(0).reader().getPointValues("field"));
+ // field that does not exist
+ assertNull(indexSearcher.getIndexReader().leaves().get(0).reader().getPointValues("some_missing_field"));
+ }
+
public void testPointValuesDoNotAffectPositionsOrOffset() throws Exception {
MemoryIndex mi = new MemoryIndex(true, true);
mi.addField(new TextField("text", "quick brown fox", Field.Store.NO), analyzer);