Apache Lucene open-source search software
count() in BooleanQuery could be early quit (#11895)
Lu Xugange5426dbbd25e
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex 1cde0758b24..0b7626b9955 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -163,6 +163,8 @@ Optimizations* GITHUB#11884: Simplify the logic of matchAll() in IndexSortSortedNumericDocValuesRangeQuery. (Lu Xugang)+* GITHUB#11895: count() in BooleanQuery could be early quit. (Lu Xugang)+Other---------------------diff --git a/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java b/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.javaindex d7279df8bbe..50fec3084b6 100644--- a/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java+++ b/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java@@ -401,8 +401,9 @@ final class BooleanWeight extends Weight {final int numDocs = context.reader().numDocs();int positiveCount;if (query.isPureDisjunction()) {- positiveCount = optCount(context, Occur.SHOULD);- } else if ((query.getClauses(Occur.FILTER).isEmpty() == false+ return optCount(context, Occur.SHOULD);+ }+ if ((query.getClauses(Occur.FILTER).isEmpty() == false|| query.getClauses(Occur.MUST).isEmpty() == false)&& query.getMinimumNumberShouldMatch() == 0) {positiveCount = reqCount(context);