Skip to content

Remove hppc from top hits agg #86150

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 3 commits into from
Apr 27, 2022
Merged

Remove hppc from top hits agg #86150

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ede9ec8
Remove hppc from top hits agg
rjernst Apr 25, 2022
7aedf9b
use LongObjectPagedHashMap
rjernst Apr 26, 2022
6f4ed23
Fix double close poissibility on error when constructing
rjernst Apr 27, 2022
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
31 changes: 15 additions & 16 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 @@ -8,9 +8,6 @@

package org.elasticsearch.search.aggregations.metrics;

import com.carrotsearch.hppc.LongObjectHashMap;
import com.carrotsearch.hppc.cursors.ObjectCursor;

import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.FieldDoc;
Expand Down Expand Up @@ -45,6 +42,7 @@
import org.elasticsearch.search.sort.SortAndFormats;

import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -99,7 +97,7 @@ public LeafBucketCollector getLeafCollector(LeafReaderContext ctx, LeafBucketCol
// 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.
final LongObjectHashMap<LeafCollector> leafCollectors = new LongObjectHashMap<>(1);
final Map<Long, LeafCollector> leafCollectors = new HashMap<>(1);
return new LeafBucketCollectorBase(sub, null) {

Scorable scorer;
Expand All @@ -108,8 +106,8 @@ public LeafBucketCollector getLeafCollector(LeafReaderContext ctx, LeafBucketCol
public void setScorer(Scorable scorer) throws IOException {
this.scorer = scorer;
super.setScorer(scorer);
for (ObjectCursor<LeafCollector> cursor : leafCollectors.values()) {
cursor.value.setScorer(scorer);
for (var leaf : leafCollectors.values()) {
leaf.setScorer(scorer);
}
}

Expand Down Expand Up @@ -140,17 +138,18 @@ public void collect(int docId, long bucket) throws IOException {
topDocsCollectors.put(bucket, collectors);
}

final LeafCollector leafCollector;
final int key = leafCollectors.indexOf(bucket);
if (key < 0) {
leafCollector = collectors.collector.getLeafCollector(ctx);
if (scorer != null) {
leafCollector.setScorer(scorer);
final Collector multiCollector = collectors.collector;
final LeafCollector leafCollector = leafCollectors.computeIfAbsent(bucket, k -> {
try {
var leaf = multiCollector.getLeafCollector(ctx);
if (scorer != null) {
leaf.setScorer(scorer);
}
return leaf;
} catch (IOException e) {
throw new UncheckedIOException(e);
}
leafCollectors.indexInsert(key, bucket, leafCollector);
} else {
leafCollector = leafCollectors.indexGet(key);
}
});
leafCollector.collect(docId);
}
};
Expand Down