Apache Solr open-source search software
LUCENE-9501: Fix invariant violation in IndexSortSortedNumericDocValuesRangeQuery. (#1833)
Julie Tibshirani37e4dbef6d11
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex c4daf8b74c0..e6c76018c3a 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -239,6 +239,9 @@ Bug Fixesalready exists instead of opening an IndexInput on the file which might throw a AccessDeniedExceptionin some Directory implementations. (Simon Willnauer)+* LUCENE-9501: Fix a bug in IndexSortSortedNumericDocValuesRangeQuery where it could violate the+ DocIdSetIterator contract. (Julie Tibshirani)+Documentation---------------------diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.javaindex 9e22117c0e6..df574c1d56f 100644--- a/lucene/sandbox/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java+++ b/lucene/sandbox/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java@@ -287,10 +287,10 @@ public class IndexSortSortedNumericDocValuesRangeQuery extends Query {int result = delegate.advance(target);if (result < lastDoc) {docID = result;- return docID;} else {- return NO_MORE_DOCS;+ docID = NO_MORE_DOCS;}+ return docID;}@Overridediff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java b/lucene/sandbox/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.javaindex da6bcf1b30f..97319dbe027 100644--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java+++ b/lucene/sandbox/src/test/org/apache/lucene/search/TestIndexSortSortedNumericDocValuesRangeQuery.java@@ -65,7 +65,7 @@ public class TestIndexSortSortedNumericDocValuesRangeQuery extends LuceneTestCasiw.deleteDocuments(LongPoint.newRangeQuery("idx", 0L, 10L));}final IndexReader reader = iw.getReader();- final IndexSearcher searcher = newSearcher(reader, false);+ final IndexSearcher searcher = newSearcher(reader);iw.close();for (int i = 0; i < 100; ++i) {