Skip to content

Apache Lucene open-source search software

LUCENE-10424: Optimize the "everything matches" case for count query in PointRangeQuery (#691)

Lu Xugang36a2149d43fd
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 7ddd7dd64f7..65e0a35972e 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -232,6 +232,8 @@ Optimizations
* LUCENE-10408 Better encoding of doc Ids in vectors. (Mayya Sharipova, Julie Tibshirani, Adrien Grand)
+* LUCENE-10424 Optimize the "everything matches" case for count query in PointRangeQuery. (Ignacio Vera, Lu Xugang)
+
* LUCENE-10084: Rewrite DocValuesFieldExistsQuery to MatchAllDocsQuery whenever terms
or points have a docCount that is equal to maxDoc. (Vigya Sharma)
diff --git a/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java b/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java
index 567104a50e3..a2329555460 100644
--- a/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java
@@ -391,6 +391,10 @@ public abstract class PointRangeQuery extends Query {
&& numDims == 1
&& values.getDocCount() == values.size()) {
// if all documents have at-most one point
+ if (relate(values.getMinPackedValue(), values.getMaxPackedValue())
+ == Relation.CELL_INSIDE_QUERY) {
+ return values.getDocCount();
+ }
return (int) pointCount(values.getPointTree(), this::relate, this::matches);
}
return super.count(context);