Apache Lucene open-source search software
fix gh-14123: Add null checks to SortingCodecReader (#14125)
Michael Sokolov1778377176b9
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex c569db7f7ad..0e7c6b13ee5 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -66,6 +66,8 @@ Bug Fixes* GITHUB#14109: prefetch may select the wrong memory segment formulti-segment slices. (Chris Hegarty)+* GITHUB#14123: SortingCodecReader NPE when segment has no (points, vectors, etc...) (Mike Sokolov)+Other---------------------diff --git a/lucene/core/src/java/org/apache/lucene/index/SortingCodecReader.java b/lucene/core/src/java/org/apache/lucene/index/SortingCodecReader.javaindex daec0c197d6..ab9964026ad 100644--- a/lucene/core/src/java/org/apache/lucene/index/SortingCodecReader.java+++ b/lucene/core/src/java/org/apache/lucene/index/SortingCodecReader.java@@ -314,6 +314,7 @@ public final class SortingCodecReader extends FilterCodecReader {SortingFloatVectorValues(FloatVectorValues delegate, Sorter.DocMap sortMap) throws IOException {this.delegate = delegate;+ assert delegate != null;// SortingValuesIterator consumes the iterator and records the docs and ord mappingiteratorSupplier = iteratorSupplier(delegate, sortMap);}@@ -446,6 +447,9 @@ public final class SortingCodecReader extends FilterCodecReader {@Overridepublic FieldsProducer getPostingsReader() {FieldsProducer postingsReader = in.getPostingsReader();+ if (postingsReader == null) {+ return null;+ }return new FieldsProducer() {@Overridepublic void close() throws IOException {@@ -481,6 +485,9 @@ public final class SortingCodecReader extends FilterCodecReader {@Overridepublic StoredFieldsReader getFieldsReader() {StoredFieldsReader delegate = in.getFieldsReader();+ if (delegate == null) {+ return null;+ }return newStoredFieldsReader(delegate);}@@ -526,6 +533,9 @@ public final class SortingCodecReader extends FilterCodecReader {@Overridepublic PointsReader getPointsReader() {final PointsReader delegate = in.getPointsReader();+ if (delegate == null) {+ return null;+ }return new PointsReader() {@Overridepublic void checkIntegrity() throws IOException {@@ -551,6 +561,9 @@ public final class SortingCodecReader extends FilterCodecReader {@Overridepublic KnnVectorsReader getVectorReader() {KnnVectorsReader delegate = in.getVectorReader();+ if (delegate == null) {+ return null;+ }return new KnnVectorsReader() {@Overridepublic void checkIntegrity() throws IOException {@@ -587,6 +600,9 @@ public final class SortingCodecReader extends FilterCodecReader {@Overridepublic NormsProducer getNormsReader() {final NormsProducer delegate = in.getNormsReader();+ if (delegate == null) {+ return null;+ }return new NormsProducer() {@Overridepublic NumericDocValues getNorms(FieldInfo field) throws IOException {@@ -609,6 +625,9 @@ public final class SortingCodecReader extends FilterCodecReader {@Overridepublic DocValuesProducer getDocValuesReader() {final DocValuesProducer delegate = in.getDocValuesReader();+ if (delegate == null) {+ return null;+ }return new DocValuesProducer() {@Overridepublic NumericDocValues getNumeric(FieldInfo field) throws IOException {@@ -710,6 +729,9 @@ public final class SortingCodecReader extends FilterCodecReader {}private TermVectorsReader newTermVectorsReader(TermVectorsReader delegate) {+ if (delegate == null) {+ return null;+ }return new TermVectorsReader() {@Overridepublic void prefetch(int doc) throws IOException {diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java b/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.javaindex 8039d8b8f6f..285296d55c1 100644--- a/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java+++ b/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java@@ -25,6 +25,7 @@ import java.util.Arrays;import java.util.Collections;import java.util.List;import java.util.Locale;+import org.apache.lucene.codecs.KnnVectorsReader;import org.apache.lucene.codecs.TermVectorsReader;import org.apache.lucene.codecs.hnsw.HnswGraphProvider;import org.apache.lucene.document.BinaryDocValuesField;@@ -153,14 +154,16 @@ public class TestSortingCodecReader extends LuceneTestCase {docIds.add(i);}Collections.shuffle(docIds, random());- // If true, index a vector for every doc- boolean denseVectors = random().nextBoolean();+ // If true, index a vector and points for every doc+ boolean dense = random().nextBoolean();try (RandomIndexWriter iw = new RandomIndexWriter(random(), dir)) {for (int i = 0; i < numDocs; i++) {int docId = docIds.get(i);Document doc = new Document();doc.add(new StringField("string_id", Integer.toString(docId), Field.Store.YES));- doc.add(new LongPoint("point_id", docId));+ if (dense || docId % 3 == 0) {+ doc.add(new LongPoint("point_id", docId));+ }String s = RandomStrings.randomRealisticUnicodeOfLength(random(), 25);doc.add(new TextField("text_field", s, Field.Store.YES));doc.add(new BinaryDocValuesField("text_field", new BytesRef(s)));@@ -172,7 +175,7 @@ public class TestSortingCodecReader extends LuceneTestCase {doc.add(new BinaryDocValuesField("binary_dv", new BytesRef(Integer.toString(docId))));doc.add(new SortedSetDocValuesField("sorted_set_dv", new BytesRef(Integer.toString(docId))));- if (denseVectors || docId % 2 == 0) {+ if (dense || docId % 2 == 0) {doc.add(new KnnFloatVectorField("vector", new float[] {(float) docId}));}doc.add(new NumericDocValuesField("foo", random().nextInt(20)));@@ -245,8 +248,13 @@ public class TestSortingCodecReader extends LuceneTestCase {SortedSetDocValues sorted_set_dv = leaf.getSortedSetDocValues("sorted_set_dv");SortedDocValues binary_sorted_dv = leaf.getSortedDocValues("binary_sorted_dv");FloatVectorValues vectorValues = leaf.getFloatVectorValues("vector");- HnswGraph graph =- ((HnswGraphProvider) ((CodecReader) leaf).getVectorReader()).getGraph("vector");+ KnnVectorsReader vectorsReader = ((CodecReader) leaf).getVectorReader();+ HnswGraph graph;+ if (vectorsReader instanceof HnswGraphProvider hnswGraphProvider) {+ graph = hnswGraphProvider.getGraph("vector");+ } else {+ graph = null;+ }NumericDocValues ids = leaf.getNumericDocValues("id");long prevValue = -1;boolean usingAltIds = false;@@ -272,10 +280,12 @@ public class TestSortingCodecReader extends LuceneTestCase {assertTrue(sorted_numeric_dv.advanceExact(idNext));assertTrue(sorted_set_dv.advanceExact(idNext));assertTrue(binary_sorted_dv.advanceExact(idNext));- if (denseVectors || prevValue % 2 == 0) {+ if (dense || prevValue % 2 == 0) {assertEquals(idNext, valuesIterator.advance(idNext));- graph.seek(0, valuesIterator.index());- assertNotEquals(DocIdSetIterator.NO_MORE_DOCS, graph.nextNeighbor());+ if (graph != null) {+ graph.seek(0, valuesIterator.index());+ assertNotEquals(DocIdSetIterator.NO_MORE_DOCS, graph.nextNeighbor());+ }}assertEquals(new BytesRef(ids.longValue() + ""), binary_dv.binaryValue());@@ -289,7 +299,7 @@ public class TestSortingCodecReader extends LuceneTestCase {assertEquals(1, sorted_numeric_dv.docValueCount());assertEquals(ids.longValue(), sorted_numeric_dv.nextValue());- if (denseVectors || prevValue % 2 == 0) {+ if (dense || prevValue % 2 == 0) {float[] vectorValue = vectorValues.vectorValue(valuesIterator.index());assertEquals(1, vectorValue.length);assertEquals((float) ids.longValue(), vectorValue[0], 0.001f);@@ -306,9 +316,13 @@ public class TestSortingCodecReader extends LuceneTestCase {leaf.storedFields().document(idNext).get("string_id"));IndexSearcher searcher = new IndexSearcher(r);TopDocs result =- searcher.search(LongPoint.newExactQuery("point_id", ids.longValue()), 1);- assertEquals(1, result.totalHits.value());- assertEquals(idNext, result.scoreDocs[0].doc);+ searcher.search(LongPoint.newExactQuery("point_id", ids.longValue()), 10);+ if (dense || ids.longValue() % 3 == 0) {+ assertEquals(1, result.totalHits.value());+ assertEquals(idNext, result.scoreDocs[0].doc);+ } else {+ assertEquals(0, result.totalHits.value());+ }result =searcher.search(new TermQuery(new Term("string_id", "" + ids.longValue())), 1);