Apache Solr open-source search software
SOLR-17670: Fix unnecessary memory allocation caused by a large reRankDocs param (#3181)
jiabao.gao76c09a35dba4
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex b54b271e560..9162f377b0d 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -246,6 +246,8 @@ Other Changes* SOLR-17667: Simplify zombie server logic in LBSolrClient (Houston Putman)+* SOLR-17670: Fix unnecessary memory allocation caused by a large reRankDocs param. (JiaBao Gao)+================== 9.8.0 ==================New Features---------------------diff --git a/solr/core/src/java/org/apache/solr/search/ReRankCollector.java b/solr/core/src/java/org/apache/solr/search/ReRankCollector.javaindex bf4c19b4063..d5258ff7152 100644--- a/solr/core/src/java/org/apache/solr/search/ReRankCollector.java+++ b/solr/core/src/java/org/apache/solr/search/ReRankCollector.java@@ -83,15 +83,15 @@ public class ReRankCollector extends TopDocsCollector<ScoreDoc> {this.boostedPriority = boostedPriority;this.query = cmd.getQuery();Sort sort = cmd.getSort();+ int maxDoc = searcher.getIndexReader().maxDoc();+ int numHits = Math.min(Math.max(this.reRankDocs, length), maxDoc);if (sort == null) {this.sort = null;- this.mainCollector =- TopScoreDocCollector.create(Math.max(this.reRankDocs, length), cmd.getMinExactCount());+ this.mainCollector = TopScoreDocCollector.create(numHits, cmd.getMinExactCount());} else {this.sort = sort = sort.rewrite(searcher);// scores are needed for Rescorer (regardless of whether sort needs it)- this.mainCollector =- TopFieldCollector.create(sort, Math.max(this.reRankDocs, length), cmd.getMinExactCount());+ this.mainCollector = TopFieldCollector.create(sort, numHits, cmd.getMinExactCount());}this.searcher = searcher;this.reRankQueryRescorer = reRankQueryRescorer;