Apache Lucene open-source search software
Improve PointRangeQuery's "inverse" optimization. (#14353)
Adrien Granda7312aa42406
diff --git a/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java b/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.javaindex 23bdaffa10c..fddafdcaef7 100644--- a/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java+++ b/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java@@ -212,28 +212,28 @@ public abstract class PointRangeQuery extends Query {};}- /** Create a visitor that clears documents that do NOT match the range. */+ /** Create a visitor that sets documents that do NOT match the range. */private IntersectVisitor getInverseIntersectVisitor(FixedBitSet result, long[] cost) {return new IntersectVisitor() {@Overridepublic void visit(int docID) {- result.clear(docID);- cost[0]--;+ result.set(docID);+ cost[0]++;}@Overridepublic void visit(DocIdSetIterator iterator) throws IOException {- result.andNot(iterator);- cost[0] = Math.max(0, cost[0] - iterator.cost());+ result.or(iterator);+ cost[0] += iterator.cost();}@Overridepublic void visit(IntsRef ref) {for (int i = ref.offset; i < ref.offset + ref.length; i++) {- result.clear(ref.ints[i]);+ result.set(ref.ints[i]);}- cost[0] = Math.max(0, cost[0] - ref.length);+ cost[0] += ref.length;}@Override@@ -358,9 +358,11 @@ public abstract class PointRangeQuery extends Query {// than half the leaf size then maybe we can make things faster// by computing the set of documents that do NOT match the rangefinal FixedBitSet result = new FixedBitSet(reader.maxDoc());- result.set(0, reader.maxDoc());- long[] cost = new long[] {reader.maxDoc()};+ long[] cost = new long[1];values.intersect(getInverseIntersectVisitor(result, cost));+ // Flip the bit set and cost+ result.flip(0, reader.maxDoc());+ cost[0] = Math.max(0, reader.maxDoc() - cost[0]);return new BitSetIterator(result, cost[0]);}