[core] Make fields private in BloomFilter

apache · Apr 7, 2024 · 7ccc7dd · 7ccc7dd
1 parent 58beebe
commit 7ccc7dd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/paimon-common/src/main/java/org/apache/paimon/utils/BloomFilter.java b/paimon-common/src/main/java/org/apache/paimon/utils/BloomFilter.java
@@ -26,17 +26,20 @@
 /** Bloom filter based on one memory segment. */
 public class BloomFilter {
 
-    protected BitSet bitSet;
-    protected long expectedEntries;
-    protected int numHashFunctions;
+    private final BitSet bitSet;
+    private final int numHashFunctions;
 
     public BloomFilter(long expectedEntries, int byteSize) {
         checkArgument(expectedEntries > 0, "expectedEntries should be > 0");
-        this.expectedEntries = expectedEntries;
         this.numHashFunctions = optimalNumOfHashFunctions(expectedEntries, (long) byteSize << 3);
         this.bitSet = new BitSet(byteSize);
     }
 
+    @VisibleForTesting
+    int numHashFunctions() {
+        return numHashFunctions;
+    }
+
     public void setMemorySegment(MemorySegment memorySegment, int offset) {
         this.bitSet.setMemorySegment(memorySegment, offset);
     }

diff --git a/paimon-common/src/test/java/org/apache/paimon/utils/BloomFilterTest.java b/paimon-common/src/test/java/org/apache/paimon/utils/BloomFilterTest.java
@@ -46,19 +46,19 @@ public void testOneSegmentBuilder() {
 
     @Test
     public void testEstimatedHashFunctions() {
-        Assertions.assertThat(BloomFilter.builder(1000, 0.01).getFilter().numHashFunctions)
+        Assertions.assertThat(BloomFilter.builder(1000, 0.01).getFilter().numHashFunctions())
                 .isEqualTo(7);
-        Assertions.assertThat(BloomFilter.builder(10_000, 0.01).getFilter().numHashFunctions)
+        Assertions.assertThat(BloomFilter.builder(10_000, 0.01).getFilter().numHashFunctions())
                 .isEqualTo(7);
-        Assertions.assertThat(BloomFilter.builder(100_000, 0.01).getFilter().numHashFunctions)
+        Assertions.assertThat(BloomFilter.builder(100_000, 0.01).getFilter().numHashFunctions())
                 .isEqualTo(7);
-        Assertions.assertThat(BloomFilter.builder(100_000, 0.01).getFilter().numHashFunctions)
+        Assertions.assertThat(BloomFilter.builder(100_000, 0.01).getFilter().numHashFunctions())
                 .isEqualTo(7);
-        Assertions.assertThat(BloomFilter.builder(100_000, 0.05).getFilter().numHashFunctions)
+        Assertions.assertThat(BloomFilter.builder(100_000, 0.05).getFilter().numHashFunctions())
                 .isEqualTo(4);
-        Assertions.assertThat(BloomFilter.builder(1_000_000, 0.01).getFilter().numHashFunctions)
+        Assertions.assertThat(BloomFilter.builder(1_000_000, 0.01).getFilter().numHashFunctions())
                 .isEqualTo(7);
-        Assertions.assertThat(BloomFilter.builder(1_000_000, 0.05).getFilter().numHashFunctions)
+        Assertions.assertThat(BloomFilter.builder(1_000_000, 0.05).getFilter().numHashFunctions())
                 .isEqualTo(4);
     }