You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by iv...@apache.org on 2026/05/22 10:52:38 UTC
(lucene) branch main updated: BatchDocValuesRangeIterator#intoBitSet fails when block boundary is maxDoc (#16105)
This is an automated email from the ASF dual-hosted git repository.
iverase pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/main by this push:
new 99da368e0b1 BatchDocValuesRangeIterator#intoBitSet fails when block boundary is maxDoc (#16105)
99da368e0b1 is described below
commit 99da368e0b1a3ce30f910757526778e8fe0f76e7
Author: Ignacio Vera <iv...@apache.org>
AuthorDate: Fri May 22 11:52:32 2026 +0100
BatchDocValuesRangeIterator#intoBitSet fails when block boundary is maxDoc (#16105)
---
.../lucene/search/BatchDocValuesRangeIterator.java | 2 +-
.../TestSkipBlockRangeIteratorIntoBitSet.java | 34 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/lucene/core/src/java/org/apache/lucene/search/BatchDocValuesRangeIterator.java b/lucene/core/src/java/org/apache/lucene/search/BatchDocValuesRangeIterator.java
index 971310172b4..9ad12fc2015 100644
--- a/lucene/core/src/java/org/apache/lucene/search/BatchDocValuesRangeIterator.java
+++ b/lucene/core/src/java/org/apache/lucene/search/BatchDocValuesRangeIterator.java
@@ -164,7 +164,7 @@ public final class BatchDocValuesRangeIterator extends DocIdSetIterator {
// Move past this block
doc = blockEnd;
- if (doc < upTo) {
+ if (doc <= upTo) {
blockIterator.advance(doc);
if (blockIterator.docID() == NO_MORE_DOCS) {
doc = NO_MORE_DOCS;
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSkipBlockRangeIteratorIntoBitSet.java b/lucene/core/src/test/org/apache/lucene/search/TestSkipBlockRangeIteratorIntoBitSet.java
index abd1a2516f9..49e69dda20d 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSkipBlockRangeIteratorIntoBitSet.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSkipBlockRangeIteratorIntoBitSet.java
@@ -165,6 +165,40 @@ public class TestSkipBlockRangeIteratorIntoBitSet extends BaseDocValuesSkipperTe
assertEquals("Should match only docs where score=0", expectedScore0, searcher.count(combined));
}
+ public void testIntoBitSetAdvancesWhenUpToIsBlockBoundary() throws Exception {
+ long queryMin = 10;
+ long queryMax = 20;
+
+ NumericDocValues values = docValues(queryMin, queryMax);
+ DocValuesSkipper skipper = docValuesSkipper(queryMin, queryMax, true);
+ BatchDocValuesRangeIterator iter =
+ new BatchDocValuesRangeIterator(values, skipper, queryMin, queryMax);
+ assertEquals(0, iter.nextDoc());
+
+ FixedBitSet bitSet = new FixedBitSet(2048);
+ iter.intoBitSet(128, bitSet, 0);
+
+ assertEquals("All docs in the YES block must match", 128, bitSet.cardinality());
+ assertTrue(
+ "docID must skip the NO block that starts at the block boundary, but was " + iter.docID(),
+ iter.docID() >= 512);
+
+ // Continue filling the bitset in a second window, as DenseConjunctionBulkScorer does.
+ iter.intoBitSet(2048, bitSet, 0);
+ FixedBitSet expected = new FixedBitSet(2048);
+ values = docValues(queryMin, queryMax);
+ for (int d = values.nextDoc();
+ d != DocIdSetIterator.NO_MORE_DOCS && d < 2048;
+ d = values.nextDoc()) {
+ if (values.longValue() >= queryMin && values.longValue() <= queryMax) {
+ expected.set(d);
+ }
+ }
+ FixedBitSet diff = expected.clone();
+ diff.andNot(bitSet);
+ assertEquals("Second intoBitSet window must not miss matching docs", 0, diff.cardinality());
+ }
+
/** Directly tests intoBitSet() against a linear scan reference. */
public void testIntoBitSetMatchesLinearScan() throws Exception {
doTestIntoBitSetMatchesLinearScan(reader);