Skip to content

Skip heavy TreeSet opts for the first group in SearchGroup#merge #15896

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

Open
gaobinlong wants to merge 3 commits into
base: main
Choose a base branch
from
+9 −3
Open

Skip heavy TreeSet opts for the first group in SearchGroup#merge #15896

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1566328
Skip heavy TreeSet opts for the first group in SearchGroup#merge
gaobinlong Mar 30, 2026
5f51974
Modify change log
gaobinlong Mar 31, 2026
6c27281
merge main
gaobinlong Apr 8, 2026
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 lucene/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ Optimizations

* GITHUB#15779: Improve BytesRefHash.add performance by optimize rehash operation (tyronecai)

* GITHUB#15896: Skip heavy TreeSet opts for the first group in SearchGroup#merge (Binlong Gao)

Bug Fixes
---------------------
* GITHUB#15754: Fix HTMLStripCharFilter to prevent tags from incorrectly consuming subsequent
Expand Down
10 changes: 7 additions & 3 deletions lucene/grouping/src/java/org/apache/lucene/search/grouping/SearchGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,17 @@ private void updateNextGroup(int topN, ShardIter<T> shard) {
// System.out.println(" competes=" + competes);

if (competes) {
// Group's sort changed -- remove & re-insert
if (mergedGroup.inQueue) {
// Group's sort changed -- remove & re-insert, update first group in place for
// efficiency
boolean skipHeavyOps = queue.first() == mergedGroup;
if (mergedGroup.inQueue && !skipHeavyOps) {
queue.remove(mergedGroup);
}
mergedGroup.topValues = group.sortValues;
mergedGroup.minShardIndex = shard.shardIndex;
queue.add(mergedGroup);
if (!skipHeavyOps) {
queue.add(mergedGroup);
}
mergedGroup.inQueue = true;
}
}
Expand Down
Loading