Skip to content

Apache Lucene open-source search software

Fix FuzzySet#getEstimatedNumberUniqueValuesAllowingForCollisions to properly account for hashCount (#14614)

Greg Miller36b3577c17a5
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java
index 1aeeea49c4a..f41db6fb995 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java
@@ -268,18 +268,31 @@ public class FuzzySet implements Accountable {
}
public int getEstimatedUniqueValues() {
- return getEstimatedNumberUniqueValuesAllowingForCollisions(bloomSize, filter.cardinality());
+ return getEstimatedNumberUniqueValuesAllowingForCollisions(
+ bloomSize, filter.cardinality(), hashCount);
}
- // Given a set size and a the number of set bits, produces an estimate of the number of unique
- // values recorded
+ /**
+ * Given a set size and the number of set bits, produces an estimate of the number of unique
+ * values recorded (assuming a single hash function is used)
+ */
public static int getEstimatedNumberUniqueValuesAllowingForCollisions(
int setSize, int numRecordedBits) {
+ return getEstimatedNumberUniqueValuesAllowingForCollisions(setSize, numRecordedBits, 1);
+ }
+
+ /**
+ * Given a set size, the number of set bits and hash function count, produces an estimate of the
+ * number of unique values recorded
+ */
+ public static int getEstimatedNumberUniqueValuesAllowingForCollisions(
+ int setSize, int numRecordedBits, int hashCount) {
double setSizeAsDouble = setSize;
double numRecordedBitsAsDouble = numRecordedBits;
+ double hashCountAsDouble = hashCount;
double saturation = numRecordedBitsAsDouble / setSizeAsDouble;
double logInverseSaturation = Math.log(1 - saturation) * -1;
- return (int) (setSizeAsDouble * logInverseSaturation);
+ return (int) (setSizeAsDouble * logInverseSaturation / hashCountAsDouble);
}
public float getTargetMaxSaturation() {