Skip to content

Apache Lucene open-source search software

Fix DocValuesRangeIterator doc ID run ends (#16450)

Parker Timminsca89fb0f9f08
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index d361021e414..0dd711cd566 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -402,6 +402,11 @@ Optimizations
Bug Fixes
---------------------
+
+* GITHUB#16450: Fix DocValuesRangeIterator.docIDRunEnd() returning incorrect run boundaries,
+ causing bulk-scoring to skip or mis-score documents in range and ordinal set queries.
+ (Parker Timmins)
+
* GITHUB#16251: Fix UpdateGraphsUtils#computeJoinSet to not request more coverage for a node than
the node's degree. Previously nodes with a degree of 1 were always forced into the join set,
which made the join set degenerate to the whole graph on hub-and-spoke shaped HNSW graphs.
diff --git a/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeIterator.java b/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeIterator.java
index 632ad1238ef..d79bf57fbd4 100644
--- a/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeIterator.java
+++ b/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeIterator.java
@@ -291,11 +291,6 @@ public abstract sealed class DocValuesRangeIterator extends TwoPhaseIterator {
return advanceDisi(blockIterator.docID()) && predicate.get();
}
- @Override
- public int docIDRunEnd() throws IOException {
- return blockIterator.docID() + 1;
- }
-
@Override
public final float matchCost() {
return matchCost;
@@ -329,7 +324,12 @@ public abstract sealed class DocValuesRangeIterator extends TwoPhaseIterator {
@Override
public final int docIDRunEnd() throws IOException {
- return blockIterator.docIDRunEnd();
+ // docIDRunEnd() may be called on non-matches, so only YES proves that the current doc and the
+ // rest of the run are actual matches.
+ return switch (blockIterator.getMatch()) {
+ case YES -> blockIterator.docIDRunEnd();
+ case YES_IF_PRESENT, MAYBE -> blockIterator.docID();
+ };
}
@Override
@@ -337,7 +337,7 @@ public abstract sealed class DocValuesRangeIterator extends TwoPhaseIterator {
while (blockIterator.docID() < upTo) {
int blockStart = blockIterator.docID();
SkipBlockRangeIterator.Match match = blockIterator.getMatch();
- int blockEnd = blockEnd(upTo, match);
+ int blockEnd = blockEnd(upTo);
switch (match) {
case YES -> bitSet.set(blockStart - offset, blockEnd - offset);
case YES_IF_PRESENT -> {
@@ -360,12 +360,10 @@ public abstract sealed class DocValuesRangeIterator extends TwoPhaseIterator {
abstract void intoMaybeBlock(int blockStart, int blockEnd, FixedBitSet bitSet, int offset)
throws IOException;
- // For MAYBE blocks docIDRunEnd() is conservative (doc+1), so use the full block boundary to
- // evaluate/classify the whole block at once.
- private int blockEnd(int upTo, SkipBlockRangeIterator.Match match) throws IOException {
- return match == SkipBlockRangeIterator.Match.MAYBE
- ? Math.min(upTo, blockIterator.blockEnd())
- : Math.min(upTo, blockIterator.docIDRunEnd());
+ // For MAYBE/YES_IF_PRESENT blocks this is the block boundary; for YES blocks it may extend
+ // further via multi-level run expansion.
+ private int blockEnd(int upTo) throws IOException {
+ return Math.min(upTo, blockIterator.docIDRunEnd());
}
@Override
@@ -380,7 +378,7 @@ public abstract sealed class DocValuesRangeIterator extends TwoPhaseIterator {
bitSet.clear(cursor - offset, blockStart - offset);
}
SkipBlockRangeIterator.Match match = blockIterator.getMatch();
- int blockEnd = blockEnd(upTo, match);
+ int blockEnd = blockEnd(upTo);
if (match != SkipBlockRangeIterator.Match.YES
&& bitSet.nextSetBit(blockStart - offset, blockEnd - offset)
diff --git a/lucene/core/src/java/org/apache/lucene/search/SkipBlockRangeIterator.java b/lucene/core/src/java/org/apache/lucene/search/SkipBlockRangeIterator.java
index ea5571540c2..a98994728bc 100644
--- a/lucene/core/src/java/org/apache/lucene/search/SkipBlockRangeIterator.java
+++ b/lucene/core/src/java/org/apache/lucene/search/SkipBlockRangeIterator.java
@@ -113,9 +113,8 @@ public class SkipBlockRangeIterator extends AbstractDocIdSetIterator {
/**
* Returns the exclusive end of the current skip block (the actual block boundary from the
- * skipper), regardless of match state. Unlike {@link #docIDRunEnd()} which returns {@code doc+1}
- * for MAYBE blocks, this always returns the full block boundary so callers can bulk-evaluate the
- * entire block at once.
+ * skipper), regardless of match state. {@link #docIDRunEnd()} returns the same boundary for MAYBE
+ * and YES_IF_PRESENT blocks, but may extend beyond it for YES blocks.
*/
public int blockEnd() {
return skipper.maxDocID(0) + 1;
@@ -123,18 +122,17 @@ public class SkipBlockRangeIterator extends AbstractDocIdSetIterator {
@Override
public int docIDRunEnd() throws IOException {
- if (match != Match.YES) {
- return doc + 1;
- }
int maxDoc = skipper.maxDocID(0);
- int nextLevel = 1;
- while (nextLevel < skipper.numLevels()
- && skipper.minValue(nextLevel) >= minValue
- && skipper.maxValue(nextLevel) <= maxValue
- && skipper.maxDocID(nextLevel) - skipper.minDocID(nextLevel)
- == skipper.docCount(nextLevel) - 1) {
- maxDoc = skipper.maxDocID(nextLevel);
- nextLevel++;
+ if (match == Match.YES) {
+ int nextLevel = 1;
+ while (nextLevel < skipper.numLevels()
+ && skipper.minValue(nextLevel) >= minValue
+ && skipper.maxValue(nextLevel) <= maxValue
+ && skipper.maxDocID(nextLevel) - skipper.minDocID(nextLevel)
+ == skipper.docCount(nextLevel) - 1) {
+ maxDoc = skipper.maxDocID(nextLevel);
+ nextLevel++;
+ }
}
return maxDoc + 1;
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesOrdinalRangeIterator.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesOrdinalRangeIterator.java
index c942cba818f..4cc516bc2e7 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesOrdinalRangeIterator.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesOrdinalRangeIterator.java
@@ -252,17 +252,31 @@ public class TestDocValuesOrdinalRangeIterator extends BaseDocValuesSkipperTests
approx.advance(64);
assertEquals(128, iter.docIDRunEnd());
+ // MAYBE block, no match: docIDRunEnd returns docID to signal an empty run.
approx.advance(512);
- assertEquals(513, iter.docIDRunEnd());
+ assertFalse(iter.matches());
+ assertEquals(512, iter.docIDRunEnd());
+
+ // MAYBE block, match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(514);
+ assertTrue(iter.matches());
+ assertEquals(514, iter.docIDRunEnd());
// YES block in second repetition (dense up to DENSE_END=1088)
approx.advance(1024);
assertEquals(SkipBlockRangeIterator.Match.YES, approx.getMatch());
assertEquals(1088, iter.docIDRunEnd());
- // YES_IF_PRESENT block
+ // YES_IF_PRESENT block, match: docIDRunEnd returns docID to signal an empty run.
approx.advance(1088);
assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, approx.getMatch());
+ assertTrue(iter.matches());
+ assertEquals(1088, iter.docIDRunEnd());
+
+ // YES_IF_PRESENT block, no match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(1089);
+ assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, approx.getMatch());
+ assertFalse(iter.matches());
assertEquals(1089, iter.docIDRunEnd());
}
@@ -531,18 +545,33 @@ public class TestDocValuesOrdinalRangeIterator extends BaseDocValuesSkipperTests
approx.advance(64);
assertEquals(128, iter.docIDRunEnd());
+ // MAYBE block, match: docIDRunEnd returns docID to signal an empty run.
approx.advance(512);
assertEquals(SkipBlockRangeIterator.Match.MAYBE, approx.getMatch());
- assertEquals(513, iter.docIDRunEnd());
+ assertTrue(iter.matches());
+ assertEquals(512, iter.docIDRunEnd());
+
+ // MAYBE block, no match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(516);
+ assertEquals(SkipBlockRangeIterator.Match.MAYBE, approx.getMatch());
+ assertFalse(iter.matches());
+ assertEquals(516, iter.docIDRunEnd());
// YES block in second repetition (dense up to DENSE_END=1088)
approx.advance(1024);
assertEquals(SkipBlockRangeIterator.Match.YES, approx.getMatch());
assertEquals(1088, iter.docIDRunEnd());
- // YES_IF_PRESENT block
+ // YES_IF_PRESENT block, match: docIDRunEnd returns docID to signal an empty run.
approx.advance(1088);
assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, approx.getMatch());
+ assertTrue(iter.matches());
+ assertEquals(1088, iter.docIDRunEnd());
+
+ // YES_IF_PRESENT block, no match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(1089);
+ assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, approx.getMatch());
+ assertFalse(iter.matches());
assertEquals(1089, iter.docIDRunEnd());
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesOrdinalSetIterator.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesOrdinalSetIterator.java
index a76c02eca48..77db72e0400 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesOrdinalSetIterator.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesOrdinalSetIterator.java
@@ -19,13 +19,20 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.apache.lucene.codecs.lucene104.Lucene104Codec;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.SortedDocValuesField;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocValuesSkipper;
import org.apache.lucene.index.ImpactsEnum;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.SortedDocValues;
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.index.TermState;
import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.store.Directory;
import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOBooleanSupplier;
@@ -156,21 +163,21 @@ public class TestDocValuesOrdinalSetIterator extends BaseDocValuesSkipperTests {
// SortedDocValues (single-valued ordinals with a set)
// ==========================================================================
- /**
- * Single ordinal per doc. Uses ordinal 14 (in the set) for the in-range region, and ordinal 15
- * (in the gap) for the mixed region's case 2.
- */
+ /** Single ordinal per doc. The in-range region alternates between a set member and a gap. */
private static int singleOrdinal(int doc) {
int d = doc % 1024;
if (d < 128) {
- return 14;
+ // 14 and 15 (GAP_ORD) are in range, but 15 is not in the matching ordinal set
+ return (doc & 1) == 0 ? 14 : (int) GAP_ORD;
} else if (d < 256) {
return (int) (QUERY_MAX + 1);
} else if (d < 512) {
return (int) (QUERY_MIN - 1);
} else {
return switch ((d / 2) % 3) {
- case 0 -> (int) (QUERY_MIN - 1);
+ // Include values in the ord set, values outside the range, and values in the range but not
+ // in the ord set.
+ case 0 -> (int) QUERY_MAX;
case 1 -> (int) (QUERY_MAX + 1);
case 2 -> (int) GAP_ORD;
default -> throw new AssertionError();
@@ -390,39 +397,50 @@ public class TestDocValuesOrdinalSetIterator extends BaseDocValuesSkipperTests {
approx.advance(0);
assertFalse(iter.matches());
- // The key signal: docIDRunEnd must collapse to doc+1 because the set is not contiguous and
- // every doc still needs per-doc predicate confirmation.
- assertEquals(1, iter.docIDRunEnd());
+ // No match: docIDRunEnd returns docID to signal an empty run.
+ assertEquals(0, iter.docIDRunEnd());
}
// --- SortedDocValues: docIdRunEnd is conservative with ordinal sets ---
- public void testSortedDocValuesDocIdRunEndAlwaysDocPlusOne() throws IOException {
+ public void testSortedDocValuesDocIdRunEnd() throws IOException {
DocValuesRangeIterator iter = createSortedDocValuesIterator(true);
SkipBlockRangeIterator approx = (SkipBlockRangeIterator) iter.approximation();
- // Even in a YES block, docIdRunEnd returns doc+1 because ordinal sets
- // may have gaps that the block-level check cannot detect.
+ // YES block, match: docIDRunEnd returns docID to signal an empty run.
approx.advance(0);
assertEquals(SkipBlockRangeIterator.Match.YES, approx.getMatch());
- assertEquals(1, iter.docIDRunEnd());
+ assertTrue(iter.matches());
+ assertEquals(0, iter.docIDRunEnd());
- approx.advance(64);
- assertEquals(65, iter.docIDRunEnd());
+ // YES block, no match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(1);
+ assertEquals(SkipBlockRangeIterator.Match.YES, approx.getMatch());
+ assertFalse(iter.matches());
+ assertEquals(1, iter.docIDRunEnd());
- // MAYBE block: same behavior as forOrdinalRange
+ // MAYBE block, no match: docIDRunEnd returns docID to signal an empty run.
approx.advance(512);
assertEquals(SkipBlockRangeIterator.Match.MAYBE, approx.getMatch());
- assertEquals(513, iter.docIDRunEnd());
+ assertFalse(iter.matches());
+ assertEquals(512, iter.docIDRunEnd());
- // YES block in second repetition (dense up to DENSE_END=1088): also doc+1
- approx.advance(1024);
- assertEquals(SkipBlockRangeIterator.Match.YES, approx.getMatch());
- assertEquals(1025, iter.docIDRunEnd());
+ // MAYBE block, match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(516);
+ assertEquals(SkipBlockRangeIterator.Match.MAYBE, approx.getMatch());
+ assertTrue(iter.matches());
+ assertEquals(516, iter.docIDRunEnd());
- // YES_IF_PRESENT block: also doc+1
+ // YES_IF_PRESENT block, match: docIDRunEnd returns docID to signal an empty run.
approx.advance(1088);
assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, approx.getMatch());
+ assertTrue(iter.matches());
+ assertEquals(1088, iter.docIDRunEnd());
+
+ // YES_IF_PRESENT block, no match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(1089);
+ assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, approx.getMatch());
+ assertFalse(iter.matches());
assertEquals(1089, iter.docIDRunEnd());
}
@@ -442,7 +460,8 @@ public class TestDocValuesOrdinalSetIterator extends BaseDocValuesSkipperTests {
private static long[] ordinalPair(int doc) {
int d = doc % 1024;
if (d < 128) {
- return new long[] {QUERY_MIN, QUERY_MAX};
+ // All values are in range, but GAP_ORD is not in the ord set
+ return (doc & 1) == 0 ? new long[] {QUERY_MIN, QUERY_MAX} : new long[] {GAP_ORD, GAP_ORD};
} else if (d < 256) {
return new long[] {QUERY_MAX + 1, QUERY_MAX + 1};
} else if (d < 512) {
@@ -633,26 +652,44 @@ public class TestDocValuesOrdinalSetIterator extends BaseDocValuesSkipperTests {
// --- SortedSetDocValues: docIdRunEnd ---
- public void testSortedSetDocIdRunEndAlwaysDocPlusOne() throws IOException {
+ public void testSortedSetDocIdRunEnd() throws IOException {
DocValuesRangeIterator iter = createSortedSetDocValuesIterator(true);
SkipBlockRangeIterator approx = (SkipBlockRangeIterator) iter.approximation();
+ // YES block, match: docIDRunEnd returns docID to signal an empty run.
approx.advance(0);
assertEquals(SkipBlockRangeIterator.Match.YES, approx.getMatch());
+ assertTrue(iter.matches());
+ assertEquals(0, iter.docIDRunEnd());
+
+ // YES block, no match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(1);
+ assertEquals(SkipBlockRangeIterator.Match.YES, approx.getMatch());
+ assertFalse(iter.matches());
assertEquals(1, iter.docIDRunEnd());
+ // MAYBE block, match: docIDRunEnd returns docID to signal an empty run.
approx.advance(512);
assertEquals(SkipBlockRangeIterator.Match.MAYBE, approx.getMatch());
- assertEquals(513, iter.docIDRunEnd());
+ assertTrue(iter.matches());
+ assertEquals(512, iter.docIDRunEnd());
- // YES block in second repetition (dense up to DENSE_END=1088)
- approx.advance(1024);
- assertEquals(SkipBlockRangeIterator.Match.YES, approx.getMatch());
- assertEquals(1025, iter.docIDRunEnd());
+ // MAYBE block, no match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(516);
+ assertEquals(SkipBlockRangeIterator.Match.MAYBE, approx.getMatch());
+ assertFalse(iter.matches());
+ assertEquals(516, iter.docIDRunEnd());
- // YES_IF_PRESENT block
+ // YES_IF_PRESENT block, match: docIDRunEnd returns docID to signal an empty run.
approx.advance(1088);
assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, approx.getMatch());
+ assertTrue(iter.matches());
+ assertEquals(1088, iter.docIDRunEnd());
+
+ // YES_IF_PRESENT block, no match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(1089);
+ assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, approx.getMatch());
+ assertFalse(iter.matches());
assertEquals(1089, iter.docIDRunEnd());
}
@@ -725,4 +762,50 @@ public class TestDocValuesOrdinalSetIterator extends BaseDocValuesSkipperTests {
// Odd doc has no value → no match
assertFalse(iter.matches());
}
+
+ /**
+ * Regression test: {@code DocValuesBlockRangeIterator.docIDRunEnd()} previously returned {@code
+ * doc+1} unconditionally, causing {@code DenseConjunctionBulkScorer} to collect false positives
+ * in the trailing single-doc window of a {@code WINDOW_SIZE+1}-doc segment.
+ */
+ public void testOrdinalSetDocIDRunEndFalsePositive() throws IOException {
+ int maxDoc = DenseConjunctionBulkScorer.WINDOW_SIZE + 1;
+ try (Directory dir = newDirectory()) {
+ IndexWriterConfig iwc = new IndexWriterConfig().setCodec(new Lucene104Codec());
+ try (IndexWriter w = new IndexWriter(dir, iwc)) {
+ for (int i = 0; i < maxDoc; i++) {
+ Document doc = new Document();
+ // Last doc gets "bbb" (ord 1): inside the bounding range [0,2] but not in the set {0,2}.
+ String val = (i == maxDoc - 1) ? "bbb" : (i % 100 == 0 ? "ccc" : "aaa");
+ doc.add(SortedDocValuesField.indexedField("field", new BytesRef(val)));
+ w.addDocument(doc);
+ }
+ w.forceMerge(1);
+ }
+ try (DirectoryReader reader = DirectoryReader.open(dir)) {
+ // Non-contiguous ordinal set {aaa=0, ccc=2}: gap at bbb=1 forces
+ // DocValuesBlockRangeIterator.
+ Query setQuery =
+ SortedDocValuesField.newSlowSetQuery(
+ "field", List.of(new BytesRef("aaa"), new BytesRef("ccc")));
+ // Range [aaa,ccc] matches all docs. A two-clause FILTER conjunction causes
+ // BooleanScorerSupplier to use DenseConjunctionBulkScorer.of(), which extracts the set
+ // query's DocValuesBlockRangeIterator as a TwoPhaseIterator — the production code path.
+ Query rangeQuery =
+ SortedDocValuesField.newSlowRangeQuery(
+ "field", new BytesRef("aaa"), new BytesRef("ccc"), true, true);
+ Query q =
+ new BooleanQuery.Builder()
+ .add(setQuery, BooleanClause.Occur.FILTER)
+ .add(rangeQuery, BooleanClause.Occur.FILTER)
+ .build();
+
+ IndexSearcher searcher = new IndexSearcher(reader);
+ // Disable cache: the test framework's LRUQueryCache may cache a clause as a plain
+ // DocIdSetIterator, bypassing the TwoPhaseIterator and preventing the bug from triggering.
+ searcher.setQueryCache(null);
+ assertEquals(maxDoc - 1, searcher.count(q));
+ }
+ }
+ }
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRangeIterator.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRangeIterator.java
index 0d0a1bb95c2..24d7dc87552 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRangeIterator.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRangeIterator.java
@@ -272,23 +272,33 @@ public class TestDocValuesRangeIterator extends BaseDocValuesSkipperTests {
DocValuesRangeIterator iter = createIterator(true);
SkipBlockRangeIterator approx = (SkipBlockRangeIterator) iter.approximation();
- // MAYBE blocks cannot guarantee all docs match, so docIdRunEnd = doc + 1
+ // MAYBE block, no match: docIDRunEnd returns docID to signal an empty run.
approx.advance(512);
assertEquals(SkipBlockRangeIterator.Match.MAYBE, approx.getMatch());
- assertEquals(513, iter.docIDRunEnd());
+ assertFalse(iter.matches());
+ assertEquals(512, iter.docIDRunEnd());
- approx.advance(800);
+ // MAYBE block, match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(514);
assertEquals(SkipBlockRangeIterator.Match.MAYBE, approx.getMatch());
- assertEquals(801, iter.docIDRunEnd());
+ assertTrue(iter.matches());
+ assertEquals(514, iter.docIDRunEnd());
}
public void testDocIdRunEndYesIfPresentBlock() throws IOException {
DocValuesRangeIterator iter = createIterator(true);
SkipBlockRangeIterator approx = (SkipBlockRangeIterator) iter.approximation();
- // YES_IF_PRESENT blocks have gaps, so docIdRunEnd = doc + 1
+ // YES_IF_PRESENT block, match: docIDRunEnd returns docID to signal an empty run.
approx.advance(1088);
assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, approx.getMatch());
+ assertTrue(iter.matches());
+ assertEquals(1088, iter.docIDRunEnd());
+
+ // YES_IF_PRESENT block, no match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(1089);
+ assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, approx.getMatch());
+ assertFalse(iter.matches());
assertEquals(1089, iter.docIDRunEnd());
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSkipBlockRangeIterator.java b/lucene/core/src/test/org/apache/lucene/search/TestSkipBlockRangeIterator.java
index 9e7b32a29ea..7587ea391dd 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSkipBlockRangeIterator.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSkipBlockRangeIterator.java
@@ -31,14 +31,17 @@ public class TestSkipBlockRangeIterator extends BaseDocValuesSkipperTests {
assertEquals(128, it.docIDRunEnd());
assertEquals(100, it.advance(100));
assertEquals(512, it.advance(300));
- assertEquals(513, it.docIDRunEnd());
+ assertEquals(SkipBlockRangeIterator.Match.MAYBE, it.getMatch());
+ assertEquals(576, it.docIDRunEnd());
// Block [1024,1087] is dense YES, but level-1 [1024,1151] is sparse: can't expand
assertEquals(1024, it.advance(1024));
assertEquals(1088, it.docIDRunEnd());
assertEquals(1100, it.advance(1100));
- assertEquals(1101, it.docIDRunEnd());
+ assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, it.getMatch());
+ assertEquals(1152, it.docIDRunEnd());
assertEquals(1536, it.advance(1500));
- assertEquals(1537, it.docIDRunEnd());
+ assertEquals(SkipBlockRangeIterator.Match.MAYBE, it.getMatch());
+ assertEquals(1600, it.docIDRunEnd());
assertEquals(DocIdSetIterator.NO_MORE_DOCS, it.advance(2050));
}
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericDocValuesRangeIterator.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericDocValuesRangeIterator.java
index 86e8f6a799e..afa522fa983 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericDocValuesRangeIterator.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericDocValuesRangeIterator.java
@@ -382,13 +382,17 @@ public class TestSortedNumericDocValuesRangeIterator extends BaseDocValuesSkippe
DocValuesRangeIterator iter = createIterator(true);
SkipBlockRangeIterator approx = (SkipBlockRangeIterator) iter.approximation();
+ // MAYBE block, match: docIDRunEnd returns docID to signal an empty run.
approx.advance(512);
assertEquals(SkipBlockRangeIterator.Match.MAYBE, approx.getMatch());
- assertEquals(513, iter.docIDRunEnd());
+ assertTrue(iter.matches());
+ assertEquals(512, iter.docIDRunEnd());
- approx.advance(800);
+ // MAYBE block, no match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(516);
assertEquals(SkipBlockRangeIterator.Match.MAYBE, approx.getMatch());
- assertEquals(801, iter.docIDRunEnd());
+ assertFalse(iter.matches());
+ assertEquals(516, iter.docIDRunEnd());
}
public void testDocIdRunEndYesIfPresentBlock() throws IOException {
@@ -398,11 +402,19 @@ public class TestSortedNumericDocValuesRangeIterator extends BaseDocValuesSkippe
// YES block in second repetition (dense up to DENSE_END=1088)
approx.advance(1024);
assertEquals(SkipBlockRangeIterator.Match.YES, approx.getMatch());
+ assertTrue(iter.matches());
assertEquals(1088, iter.docIDRunEnd());
- // YES_IF_PRESENT blocks have gaps, so docIdRunEnd = doc + 1
+ // YES_IF_PRESENT block, match: docIDRunEnd returns docID to signal an empty run.
approx.advance(1088);
assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, approx.getMatch());
+ assertTrue(iter.matches());
+ assertEquals(1088, iter.docIDRunEnd());
+
+ // YES_IF_PRESENT block, no match: docIDRunEnd returns docID to signal an empty run.
+ approx.advance(1089);
+ assertEquals(SkipBlockRangeIterator.Match.YES_IF_PRESENT, approx.getMatch());
+ assertFalse(iter.matches());
assertEquals(1089, iter.docIDRunEnd());
}