Invalid skipper now preserves scorerSupplier optimization

apache · Oct 28, 2024 · 99af41d · 99af41d
1 parent 7934a3e
commit 99af41d
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/lucene/core/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java b/lucene/core/src/java/org/apache/lucene/search/IndexSortSortedNumericDocValuesRangeQuery.java
@@ -467,12 +467,14 @@ private IteratorAndCount getDocIdSetIteratorOrNull(LeafReaderContext context) th
     DocValuesSkipper skipper = context.reader().getDocValuesSkipper(field);
     if (skipper != null) {
       if (skipper.minValue() > upperValue || skipper.maxValue() < lowerValue) {
-        return null;
-      }
-      if (skipper.docCount() == context.reader().maxDoc()
-          && skipper.minValue() >= lowerValue
-          && skipper.maxValue() <= upperValue) {
-        return IteratorAndCount.all(skipper.docCount());
+        // Instead of returning null, act as there's no skipper.
+        skipper = null;
+      } else {
+        if (skipper.docCount() == context.reader().maxDoc()
+            && skipper.minValue() >= lowerValue
+            && skipper.maxValue() <= upperValue) {
+          return IteratorAndCount.all(skipper.docCount());
+        }
       }
     }