From cad4fcd9c9f7c24fc9a8162d0dde66f620812961 Mon Sep 17 00:00:00 2001 From: Colin Goodheart-Smithe Date: Mon, 3 Apr 2017 09:45:16 +0100 Subject: Revert "Adds tests for cardinality and filter aggregations (#23826)" This reverts commit 058869ed549deb080522d873e3891425d377cc48. --- .../metrics/cardinality/HyperLogLogPlusPlus.java | 29 ---------------------- 1 file changed, 29 deletions(-) (limited to 'core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java') diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java index 6425cc3b68..42b4561e07 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java @@ -34,9 +34,6 @@ import org.elasticsearch.common.util.IntArray; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; /** * Hyperloglog++ counter, implemented based on pseudo code from @@ -423,32 +420,6 @@ public final class HyperLogLogPlusPlus implements Releasable { Releasables.close(runLens, hashSet.sizes); } - private Set getComparableData(long bucket) { - Set values = new HashSet<>(); - if (algorithm.get(bucket) == LINEAR_COUNTING) { - try (IntArray hashSetValues = hashSet.values(bucket)) { - for (long i = 0; i < hashSetValues.size(); i++) { - values.add(hashSetValues.get(i)); - } - } - } else { - for (long i = 0; i < runLens.size(); i++) { - values.add(runLens.get((bucket << p) + i)); - } - } - return values; - } - - public int hashCode(long bucket) { - return Objects.hash(p, algorithm.get(bucket), getComparableData(bucket)); - } - - public boolean equals(long bucket, HyperLogLogPlusPlus other) { - return Objects.equals(p, other.p) && - Objects.equals(algorithm.get(bucket), other.algorithm.get(bucket)) && - Objects.equals(getComparableData(bucket), getComparableData(bucket)); - } - /** * We are actually using HyperLogLog's runLens array but interpreting it as a hash set * for linear counting. -- cgit v1.2.3