Rename FilterType -> TestFilterType to avoid having the same class twice

Author: thomasmueller

fastfilter/src/test/java/org/fastfilter/RegressionTests.java

@@ -5,7 +5,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import static org.fastfilter.FilterType.*;
+import static org.fastfilter.TestFilterType.*;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(Parameterized.class)
@@ -57,12 +57,12 @@ public static Object[][] regressionCases() {
         };
     }
 
-    private final FilterType type;
+    private final TestFilterType type;
     private final long seed;
     private final long[] keys;
     private final int bitsPerKey;
 
-    public RegressionTests(FilterType type, long seed, long[] keys, int bitsPerKey) {
+    public RegressionTests(TestFilterType type, long seed, long[] keys, int bitsPerKey) {
         this.type = type;
         this.seed = seed;
         this.keys = keys;

fastfilter/src/test/java/org/fastfilter/SimpleFuzzer.java

@@ -8,7 +8,7 @@
 import java.util.stream.LongStream;
 
 import static junit.framework.TestCase.assertTrue;
-import static org.fastfilter.FilterType.*;
+import static org.fastfilter.TestFilterType.*;
 
 public class SimpleFuzzer {
 
@@ -17,7 +17,7 @@ public static void main(String... args) {
         for (int bitsPerKey = 8; bitsPerKey < 32; bitsPerKey += 8) {
             for (int keyLength = 3; keyLength < 1_000_000; keyLength += ThreadLocalRandom.current().nextInt(10000)) {
                 long[] keys = LongStream.range(0, keyLength).map(i -> ThreadLocalRandom.current().nextLong()).toArray();
-                for (FilterType type : FilterType.values()) {
+                for (TestFilterType type : TestFilterType.values()) {
                     try {
                         for (int i = 0; i < 1_000_000; ++i) {
                             seed = ThreadLocalRandom.current().nextLong();

fastfilter/src/test/java/org/fastfilter/TestAllFilters.java

@@ -3,7 +3,7 @@
 import static org.junit.Assert.assertEquals;
 
 import org.fastfilter.Filter;
-import org.fastfilter.FilterType;
+import org.fastfilter.TestFilterType;
 import org.fastfilter.utils.Hash;
 import org.fastfilter.utils.RandomGenerator;
 import org.junit.Test;
@@ -90,11 +90,11 @@ public static void main(String... args) {
         for (int size = 1_000_000; size <= 10_000_000; size *= 10) {
             System.out.println("size " + size);
             for (int test = 0; test < 10; test++) {
-                test(FilterType.BLOOM, size, test, true);
-                test(FilterType.BLOCKED_BLOOM, size, test, true);
-                test(FilterType.COUNTING_BLOOM, size, test, true);
-                test(FilterType.SUCCINCT_COUNTING_BLOOM, size, test, true);
-                test(FilterType.SUCCINCT_COUNTING_BLOOM_RANKED, size, test, true);
+                test(TestFilterType.BLOOM, size, test, true);
+                test(TestFilterType.BLOCKED_BLOOM, size, test, true);
+                test(TestFilterType.COUNTING_BLOOM, size, test, true);
+                test(TestFilterType.SUCCINCT_COUNTING_BLOOM, size, test, true);
+                test(TestFilterType.SUCCINCT_COUNTING_BLOOM_RANKED, size, test, true);
             }
         }
 
@@ -118,12 +118,12 @@ public void test() {
     }
 
     private static void testAll(int len, boolean log) {
-        for (FilterType type : FilterType.values()) {
+        for (TestFilterType type : TestFilterType.values()) {
             test(type, len, 0, log);
         }
     }
 
-    private static void test(FilterType type, int len, int seed, boolean log) {
+    private static void test(TestFilterType type, int len, int seed, boolean log) {
         long[] list = new long[len * 2];
         RandomGenerator.createRandomUniqueListFast(list, len + seed);
         long[] keys = new long[len];

fastfilter/src/test/java/org/fastfilter/TestFilterType.java

@@ -19,7 +19,7 @@
 /**
  * The list of supported approximate membership implementations.
  */
-public enum FilterType {
+public enum TestFilterType {
     BLOOM {
         @Override
         public Filter construct(long[] keys, int setting) {

jmh/src/main/java/org/fastfilter/ConstructionState.java

@@ -28,15 +28,15 @@ public class ConstructionState {
             "CUCKOO_PLUS_8",
             "CUCKOO_PLUS_16",
             "GCS"})
-    FilterType type;
+    TestFilterType type;
 
     long[] keys;
 
     public long[] getKeys() {
         return keys;
     }
 
-    public FilterType getConstructor() {
+    public TestFilterType getConstructor() {
         return type;
     }