fix comment

paimon-common/src/main/java/org/apache/paimon/fileindex/FileIndex.java

@@ -18,63 +18,108 @@
 
 package org.apache.paimon.fileindex;
 
+import org.apache.paimon.predicate.CompoundPredicate;
+import org.apache.paimon.predicate.FieldRef;
+import org.apache.paimon.predicate.FunctionVisitor;
+import org.apache.paimon.predicate.LeafPredicate;
 import org.apache.paimon.types.DataType;
 
+import java.util.List;
+
 /**
  * Secondary index filter interface. Return true, means we need to search this file, else means
  * needn't.
  */
-public interface FileIndex {
+public interface FileIndex extends FunctionVisitor<Boolean> {
 
     void add(Object key);
 
-    default boolean testStartsWith(Object key) {
+    byte[] serializedBytes();
+
+    @Override
+    default Boolean visit(LeafPredicate predicate) {
+        return true;
+    }
+
+    @Override
+    default Boolean visit(CompoundPredicate predicate) {
         return true;
     }
 
-    default boolean testLessThan(Object key) {
+    @Override
+    default Boolean visitIsNotNull(FieldRef fieldRef) {
         return true;
     }
 
-    default boolean testGreaterOrEqual(Object key) {
+    @Override
+    default Boolean visitIsNull(FieldRef fieldRef) {
         return true;
     }
 
-    default boolean testNotContains(Object key) {
+    @Override
+    default Boolean visitStartsWith(FieldRef fieldRef, Object literal) {
         return true;
     }
 
-    default boolean testLessOrEqual(Object key) {
+    @Override
+    default Boolean visitLessThan(FieldRef fieldRef, Object literal) {
         return true;
     }
 
-    default boolean testContains(Object key) {
+    @Override
+    default Boolean visitGreaterOrEqual(FieldRef fieldRef, Object literal) {
         return true;
     }
 
-    default boolean testGreaterThan(Object key) {
+    @Override
+    default Boolean visitNotEqual(FieldRef fieldRef, Object literal) {
         return true;
     }
 
-    default boolean testIn(Object[] keys) {
-        for (Object key : keys) {
-            if (testContains(key)) {
+    @Override
+    default Boolean visitLessOrEqual(FieldRef fieldRef, Object literal) {
+        return true;
+    }
+
+    @Override
+    default Boolean visitEqual(FieldRef fieldRef, Object literal) {
+        return true;
+    }
+
+    @Override
+    default Boolean visitGreaterThan(FieldRef fieldRef, Object literal) {
+        return true;
+    }
+
+    @Override
+    default Boolean visitIn(FieldRef fieldRef, List<Object> literals) {
+        for (Object key : literals) {
+            if (visitEqual(fieldRef, key)) {
                 return true;
             }
         }
         return false;
     }
 
-    default boolean testNotIn(Object[] keys) {
-        for (Object key : keys) {
-            if (testNotContains(key)) {
+    @Override
+    default Boolean visitNotIn(FieldRef fieldRef, List<Object> literals) {
+        for (Object key : literals) {
+            if (visitNotEqual(fieldRef, key)) {
                 return true;
             }
         }
         return false;
     }
 
-    byte[] serializedBytes();
+    @Override
+    default Boolean visitAnd(List<Boolean> children) {
+        return true;
+    }
+
+    @Override
+    default Boolean visitOr(List<Boolean> children) {
+        return true;
+    }
 
     FileIndex recoverFrom(byte[] bytes);
 

paimon-common/src/main/java/org/apache/paimon/fileindex/FileIndexPredicateTester.java

@@ -20,23 +20,20 @@
 
 import org.apache.paimon.predicate.CompoundPredicate;
 import org.apache.paimon.predicate.FieldRef;
-import org.apache.paimon.predicate.FunctionVisitor;
 import org.apache.paimon.predicate.LeafPredicate;
 import org.apache.paimon.predicate.Or;
 import org.apache.paimon.predicate.Predicate;
 import org.apache.paimon.predicate.PredicateVisitor;
 
-import java.util.List;
-
 /** Predicate test. */
 public class FileIndexPredicateTester implements PredicateVisitor<Boolean> {
 
     private final String columnName;
-    private final PredicateFunctionChecker predicateFunctionChecker;
+    private final FileIndex fileIndex;
 
     public FileIndexPredicateTester(String columnName, FileIndex fileIndex) {
         this.columnName = columnName;
-        this.predicateFunctionChecker = new PredicateFunctionChecker(fileIndex);
+        this.fileIndex = fileIndex;
     }
 
     @Override
@@ -45,7 +42,7 @@ public Boolean visit(LeafPredicate predicate) {
             return predicate
                     .function()
                     .visit(
-                            predicateFunctionChecker,
+                            fileIndex,
                             new FieldRef(
                                     predicate.index(), predicate.fieldName(), predicate.type()),
                             predicate.literals());
@@ -73,86 +70,4 @@ public Boolean visit(CompoundPredicate predicate) {
             return true;
         }
     }
-
-    private static final class PredicateFunctionChecker implements FunctionVisitor<Boolean> {
-
-        private final FileIndex fileIndex;
-
-        public PredicateFunctionChecker(FileIndex fileIndex) {
-            this.fileIndex = fileIndex;
-        }
-
-        @Override
-        public Boolean visitIsNotNull(FieldRef fieldRef) {
-            return fileIndex.testNotContains(null);
-        }
-
-        @Override
-        public Boolean visitIsNull(FieldRef fieldRef) {
-            return fileIndex.testContains(null);
-        }
-
-        @Override
-        public Boolean visitStartsWith(FieldRef fieldRef, Object literal) {
-            return fileIndex.testStartsWith(literal);
-        }
-
-        @Override
-        public Boolean visitLessThan(FieldRef fieldRef, Object literal) {
-            return fileIndex.testLessThan(literal);
-        }
-
-        @Override
-        public Boolean visitGreaterOrEqual(FieldRef fieldRef, Object literal) {
-            return fileIndex.testGreaterOrEqual(literal);
-        }
-
-        @Override
-        public Boolean visitNotEqual(FieldRef fieldRef, Object literal) {
-            return fileIndex.testNotContains(literal);
-        }
-
-        @Override
-        public Boolean visitLessOrEqual(FieldRef fieldRef, Object literal) {
-            return fileIndex.testLessOrEqual(literal);
-        }
-
-        @Override
-        public Boolean visitEqual(FieldRef fieldRef, Object literal) {
-            return fileIndex.testContains(literal);
-        }
-
-        @Override
-        public Boolean visitGreaterThan(FieldRef fieldRef, Object literal) {
-            return fileIndex.testGreaterThan(literal);
-        }
-
-        @Override
-        public Boolean visitIn(FieldRef fieldRef, List<Object> literals) {
-            Object[] keys = new byte[literals.size()][];
-            for (int i = 0; i < literals.size(); i++) {
-                keys[i] = literals.get(i);
-            }
-            return fileIndex.testIn(keys);
-        }
-
-        @Override
-        public Boolean visitNotIn(FieldRef fieldRef, List<Object> literals) {
-            Object[] keys = new byte[literals.size()][];
-            for (int i = 0; i < literals.size(); i++) {
-                keys[i] = literals.get(i);
-            }
-            return fileIndex.testNotIn(keys);
-        }
-
-        @Override
-        public Boolean visitAnd(List<Boolean> children) {
-            return true;
-        }
-
-        @Override
-        public Boolean visitOr(List<Boolean> children) {
-            return true;
-        }
-    }
 }