Skip to content

Remove hppc from terms agg #86151

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 26, 2022
Merged

Remove hppc from terms agg #86151

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b298356
Remove hppc from terms agg
rjernst Apr 25, 2022
3eb4c66
alternative without allocation
rjernst Apr 26, 2022
7aa44bb
spotless
rjernst Apr 26, 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
44 changes: 34 additions & 10 deletions server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
*/
package org.elasticsearch.search.aggregations.bucket.terms;

import com.carrotsearch.hppc.LongHashSet;
import com.carrotsearch.hppc.LongSet;

import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
Expand Down Expand Up @@ -145,29 +142,56 @@ public boolean accept(long value) {
}

public static class SetBackedLongFilter extends LongFilter {
private LongSet valids;
private LongSet invalids;
// Autoboxing long could cause allocations when doing Set.contains, so
// this alternative to java.lang.Long is not final so that a preallocated instance
// can be used in accept (note that none of this is threadsafe!)
private static class Long {
private long value;

private Long(long value) {
this.value = value;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Long that = (Long) o;
return value == that.value;
}

@Override
public int hashCode() {
return java.lang.Long.hashCode(value);
}
}

private Set<Long> valids;
private Set<Long> invalids;

private Long spare = new Long(0);

private SetBackedLongFilter(int numValids, int numInvalids) {
if (numValids > 0) {
valids = new LongHashSet(numValids);
valids = new HashSet<>(numValids);
}
if (numInvalids > 0) {
invalids = new LongHashSet(numInvalids);
invalids = new HashSet<>(numInvalids);
}
}

@Override
public boolean accept(long value) {
return (valids == null || valids.contains(value)) && (invalids == null || invalids.contains(value) == false);
spare.value = value;
return (valids == null || valids.contains(spare)) && (invalids == null || invalids.contains(spare) == false);
}

private void addAccept(long val) {
valids.add(val);
valids.add(new Long(val));
}

private void addReject(long val) {
invalids.add(val);
invalids.add(new Long(val));
}
}

Expand Down