Replace SimpleCollector driver with explicit leaf iteration in QueryUtils#16266
Merged
Conversation
Create outerWeight/shadowWeight before the search call so they are ready for the loop, eliminating the per-leaf weight creation inside collect(). Replace leafPtr with a currentLeafContext field set in doSetNextReader. Move opidx to an instance field. Rename the outer Scorable field to outerScorer to avoid a future name collision with the shadow Scorer. No behaviour change.
…tils Remove the deprecated IndexSearcher#search(Query, Collector) call. The SimpleCollector wrapper is gone; a for-loop over leaf contexts and a while-loop over matching documents are now the explicit driver. The only content changes are the array-wrapper removals (lastDoc[0] → lastDoc, lastReader[0] → lastReader) and the outer try-catch, both unavoidable consequences of removing the anonymous class.
19 tasks
Contributor
Author
|
I plan on merging this soon, please have a look if you get a chance! |
Contributor
Author
|
Thanks @romseygeek ! |
javanna
added a commit
that referenced
this pull request
Jun 30, 2026
…tils (#16266) Remove the deprecated `IndexSearcher#search(Query, Collector)` call. Rather than introducing collector managers, which add in this case unwanted complexity, the search call can be replaced by a loop over the leaves. `SimpleCollector` wrapper is gone; a for-loop over leaf contexts and a while-loop over matching documents are now the explicit driver. Relates to #12892
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Remove the deprecated
IndexSearcher#search(Query, Collector)call.Rather than introducing collector managers, which add in this case
unwanted complexity, the search call can be replaced by a loop over the leaves.
SimpleCollectorwrapper is gone; a for-loop over leaf contexts and awhile-loop over matching documents are now the explicit driver.
Relates to #12892