Skip to content

Apache Lucene open-source search software

SkipBlockRangeIterator should report docCount as its cost (#16352)

Alan Woodward8fe701c0873d
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 1d1d5a8154a..72fcd7427cd 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -323,6 +323,8 @@ Optimizations
* GITHUB#16283: Use Panama Vector API to SIMD-evaluate fixed-cardinality sorted numeric range queries in
rangeIntoBitSet. (Costin Leau)
+* GITHUB#16352: Better cost() estimation for SkipBlockRangeIterator. (Alan Woodward)
+
Bug Fixes
---------------------
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 38b8842b035..ea5571540c2 100644
--- a/lucene/core/src/java/org/apache/lucene/search/SkipBlockRangeIterator.java
+++ b/lucene/core/src/java/org/apache/lucene/search/SkipBlockRangeIterator.java
@@ -108,7 +108,7 @@ public class SkipBlockRangeIterator extends AbstractDocIdSetIterator {
@Override
public long cost() {
- return DocIdSetIterator.NO_MORE_DOCS;
+ return skipper.docCount();
}
/**
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 a5eed7864ec..9e7b32a29ea 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSkipBlockRangeIterator.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSkipBlockRangeIterator.java
@@ -54,4 +54,10 @@ public class TestSkipBlockRangeIterator extends BaseDocValuesSkipperTests {
assertEquals(expected, bitSet);
}
+
+ public void testCost() {
+ DocValuesSkipper skipper = docValuesSkipper(1, 30, random().nextBoolean());
+ SkipBlockRangeIterator it = new SkipBlockRangeIterator(skipper, 1, 30);
+ assertEquals(DENSE_END + (MAX_DOC - DENSE_END) / 2, it.cost());
+ }
}