Skip to content

SOLR-17670: Fix unnecessary memory allocation caused by a large reRankDocs param #3181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 22, 2025
Merged

SOLR-17670: Fix unnecessary memory allocation caused by a large reRankDocs param #3181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
79e9df7
Fix unnecessary memory allocation caused by a large reRankDocs param.
gaojiabao1991 Feb 11, 2025
fbb8167
Merge branch 'apache:main' into main
gaojiabao1991 Feb 13, 2025
9167a3f
update CHANGES.txt
gaojiabao1991 Feb 13, 2025
22bccf3
tidy code
gaojiabao1991 Feb 13, 2025
62d1f33
Remove non-standard unit tests.
gaojiabao1991 Feb 14, 2025
c2e3cc4
Revert the CHANGES file because it's causing a merge conflict.
gaojiabao1991 Feb 21, 2025
cadc53a
Merge branch 'apache:main' into main
gaojiabao1991 Feb 21, 2025
e85dd0a
update CHANGES
gaojiabao1991 Feb 21, 2025
71c4469
Merge branch 'main' into fork/gaojiabao1991/main
dsmiley Feb 22, 2025
98fa33b
CHANGES: move to 9.8.1
dsmiley Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions solr/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------------------
Expand Down
8 changes: 4 additions & 4 deletions solr/core/src/java/org/apache/solr/search/ReRankCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ public ReRankCollector(
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;
Expand Down
Loading