Skip to content

Simplify logic/mutability in TopHitsAggregator.getLeafCollector #122952

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

Closed
original-brownbear wants to merge 1 commit into from
Closed

Simplify logic/mutability in TopHitsAggregator.getLeafCollector #122952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 19 additions & 14 deletions server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,12 @@ public LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx,
// when post collecting then we have already replaced the leaf readers on the aggregator level have already been
// replaced with the next leaf readers and then post collection pushes docids of the previous segment, which
// then causes assertions to trip or incorrect top docs to be computed.
var leafCollectors = this.leafCollectors;
if (leafCollectors != null) {
this.leafCollectors = null; // set to null, just in case the new allocation below fails
leafCollectors.close();
leafCollectors = null; // set to null, just in case the new allocation below fails
}
leafCollectors = new LongObjectPagedHashMap<>(1, bigArrays);
final var currentLeafCollectors = this.leafCollectors = new LongObjectPagedHashMap<>(1, bigArrays);
return new LeafBucketCollectorBase(sub, null) {

Scorable scorer;
Expand All @@ -118,13 +119,21 @@ public LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx,
public void setScorer(Scorable scorer) throws IOException {
this.scorer = scorer;
super.setScorer(scorer);
for (Cursor<LeafCollector> leafCollector : leafCollectors) {
for (Cursor<LeafCollector> leafCollector : currentLeafCollectors) {
leafCollector.value.setScorer(scorer);
}
}

@Override
public void collect(int docId, long bucket) throws IOException {
LeafCollector leafCollector = currentLeafCollectors.get(bucket);
if (leafCollector == null) {
leafCollector = initLeafCollector(bucket);
}
leafCollector.collect(docId);
}

private LeafCollector initLeafCollector(long bucket) throws IOException {
Collectors collectors = topDocsCollectors.get(bucket);
if (collectors == null) {
SortAndFormats sort = subSearchContext.sort();
Expand All @@ -138,29 +147,25 @@ public void collect(int docId, long bucket) throws IOException {
// but here we create collectors ourselves and we need prevent OOM because of crazy an offset and size.
topN = Math.min(topN, subSearchContext.searcher().getIndexReader().maxDoc());
if (sort == null) {
TopScoreDocCollector topScoreDocCollector = new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE, false)
TopScoreDocCollector topScoreDocCollector = new TopScoreDocCollectorManager(topN, null, Integer.MAX_VALUE)
.newCollector();
collectors = new Collectors(topScoreDocCollector, null);
} else {
// TODO: can we pass trackTotalHits=subSearchContext.trackTotalHits(){
// Note that this would require to catch CollectionTerminatedException
collectors = new Collectors(
new TopFieldCollectorManager(sort.sort, topN, null, Integer.MAX_VALUE, false).newCollector(),
new TopFieldCollectorManager(sort.sort, topN, null, Integer.MAX_VALUE).newCollector(),
subSearchContext.trackScores() ? new MaxScoreCollector() : null
);
}
topDocsCollectors.put(bucket, collectors);
}

LeafCollector leafCollector = leafCollectors.get(bucket);
if (leafCollector == null) {
leafCollector = collectors.collector.getLeafCollector(aggCtx.getLeafReaderContext());
if (scorer != null) {
leafCollector.setScorer(scorer);
}
leafCollectors.put(bucket, leafCollector);
LeafCollector leafCollector = collectors.collector.getLeafCollector(aggCtx.getLeafReaderContext());
if (scorer != null) {
leafCollector.setScorer(scorer);
}
leafCollector.collect(docId);
currentLeafCollectors.put(bucket, leafCollector);
return leafCollector;
}
};
}
Expand Down