Skip to content

Remove hppc from nested aggs #86078

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 2 commits into from
Apr 21, 2022
Merged

Remove hppc from nested aggs #86078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0497825
Remove hppc from nested aggs
rjernst Apr 21, 2022
5475f14
address feedback
rjernst Apr 21, 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
12 changes: 5 additions & 7 deletions ...r/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
*/
package org.elasticsearch.search.aggregations.bucket.nested;

import com.carrotsearch.hppc.LongArrayList;

import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.ReaderUtil;
Expand All @@ -35,6 +33,8 @@
import org.elasticsearch.xcontent.ParseField;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

public class NestedAggregator extends BucketsAggregator implements SingleBucketAggregator {
Expand Down Expand Up @@ -141,7 +141,7 @@ class BufferingNestedLeafBucketCollector extends LeafBucketCollectorBase {
final BitSet parentDocs;
final LeafBucketCollector sub;
final DocIdSetIterator childDocs;
final LongArrayList bucketBuffer = new LongArrayList();
final List<Long> bucketBuffer = new ArrayList<>();

Scorable scorer;
int currentParentDoc = -1;
Expand Down Expand Up @@ -193,10 +193,8 @@ void processBufferedChildBuckets() throws IOException {

for (; childDocId < currentParentDoc; childDocId = childDocs.nextDoc()) {
cachedScorer.doc = childDocId;
final long[] buffer = bucketBuffer.buffer;
final int size = bucketBuffer.size();
for (int i = 0; i < size; i++) {
collectBucket(sub, childDocId, buffer[i]);
for (var bucket : bucketBuffer) {
collectBucket(sub, childDocId, bucket);
}
}
bucketBuffer.clear();
Expand Down
14 changes: 6 additions & 8 deletions ...ain/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
*/
package org.elasticsearch.search.aggregations.bucket.nested;

import com.carrotsearch.hppc.LongIntHashMap;

import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Query;
Expand All @@ -28,6 +26,7 @@
import org.elasticsearch.xcontent.ParseField;

import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

public class ReverseNestedAggregator extends BucketsAggregator implements SingleBucketAggregator {
Expand Down Expand Up @@ -63,24 +62,23 @@ protected LeafBucketCollector getLeafCollector(LeafReaderContext ctx, final Leaf
if (parentDocs == null) {
return LeafBucketCollector.NO_OP_COLLECTOR;
}
final LongIntHashMap bucketOrdToLastCollectedParentDoc = new LongIntHashMap(32);
final Map<Long, Integer> bucketOrdToLastCollectedParentDoc = new HashMap<>(32);
return new LeafBucketCollectorBase(sub, null) {
@Override
public void collect(int childDoc, long bucket) throws IOException {
// fast forward to retrieve the parentDoc this childDoc belongs to
final int parentDoc = parentDocs.nextSetBit(childDoc);
assert childDoc <= parentDoc && parentDoc != DocIdSetIterator.NO_MORE_DOCS;

int keySlot = bucketOrdToLastCollectedParentDoc.indexOf(bucket);
if (bucketOrdToLastCollectedParentDoc.indexExists(keySlot)) {
int lastCollectedParentDoc = bucketOrdToLastCollectedParentDoc.indexGet(keySlot);
Integer lastCollectedParentDoc = bucketOrdToLastCollectedParentDoc.get(bucket);
if (lastCollectedParentDoc != null) {
if (parentDoc > lastCollectedParentDoc) {
collectBucket(sub, parentDoc, bucket);
bucketOrdToLastCollectedParentDoc.indexReplace(keySlot, parentDoc);
bucketOrdToLastCollectedParentDoc.put(bucket, parentDoc);
}
} else {
collectBucket(sub, parentDoc, bucket);
bucketOrdToLastCollectedParentDoc.indexInsert(keySlot, bucket, parentDoc);
bucketOrdToLastCollectedParentDoc.put(bucket, parentDoc);
}
}
};
Expand Down