Apache Solr open-source search software
SOLR-17801: Use TotalHitCountCollector to collect count when no rows needed (#2655)
Kevin Risdenb61fdcbbec44
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 8300dd5b2b8..9146a0c84ab 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -272,6 +272,8 @@ Optimizations* SOLR-17775: Speed up function queries in 'fl' param. (Yura Korolov)+* SOLR-17801: Use TotalHitCountCollector to collect count when no rows needed (Kevin Risden)+Bug Fixes---------------------* SOLR-17629: If SQLHandler failed to open the underlying stream (e.g. Solr returns an error; could be user/syntax problem),diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.javaindex a2009aff65d..0f0735b66ac 100644--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java@@ -1895,18 +1895,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIfinal Collector collector;if (!needScores) {- collector =- new SimpleCollector() {- @Override- public void collect(int doc) {- numHits[0]++;- }-- @Override- public ScoreMode scoreMode() {- return ScoreMode.COMPLETE_NO_SCORES;- }- };+ collector = new TotalHitCountCollector();} else {collector =new SimpleCollector() {@@ -1934,6 +1923,11 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIbuildAndRunCollectorChain(qr, query, collector, cmd, pf.postFilter);totalHits = numHits[0];+ if (collector instanceof TotalHitCountCollector) {+ totalHits = ((TotalHitCountCollector) collector).getTotalHits();+ } else {+ totalHits = numHits[0];+ }maxScore = totalHits > 0 ? topscore[0] : 0.0f;docList =new DocSlice(