[core] Remove Predicate.test(Object[]) to use InternalRow (apache#2796)

lmagic233 · Jan 26, 2024 · 6d15bd3 · 6d15bd3
1 parent 973e686
commit 6d15bd3
Show file tree

Hide file tree

Showing 23 changed files with 150 additions and 243 deletions.
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/And.java b/paimon-common/src/main/java/org/apache/paimon/predicate/And.java
@@ -34,16 +34,6 @@ public class And extends CompoundPredicate.Function {
 
     private And() {}
 
-    @Override
-    public boolean test(Object[] values, List<Predicate> children) {
-        for (Predicate child : children) {
-            if (!child.test(values)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     @Override
     public boolean test(InternalRow row, List<Predicate> children) {
         for (Predicate child : children) {

diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/CompoundPredicate.java b/paimon-common/src/main/java/org/apache/paimon/predicate/CompoundPredicate.java
@@ -48,11 +48,6 @@ public List<Predicate> children() {
         return children;
     }
 
-    @Override
-    public boolean test(Object[] values) {
-        return function.test(values, children);
-    }
-
     @Override
     public boolean test(InternalRow row) {
         return function.test(row, children);
@@ -95,8 +90,6 @@ public String toString() {
     /** Evaluate the predicate result based on multiple {@link Predicate}s. */
     public abstract static class Function implements Serializable {
 
-        public abstract boolean test(Object[] values, List<Predicate> children);
-
         public abstract boolean test(InternalRow row, List<Predicate> children);
 
         public abstract boolean test(

diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/LeafPredicate.java b/paimon-common/src/main/java/org/apache/paimon/predicate/LeafPredicate.java
@@ -88,11 +88,6 @@ public LeafPredicate copyWithNewIndex(int fieldIndex) {
         return new LeafPredicate(function, type, fieldIndex, fieldName, literals);
     }
 
-    @Override
-    public boolean test(Object[] values) {
-        return function.test(type, values[fieldIndex], literals);
-    }
-
     @Override
     public boolean test(InternalRow row) {
         return function.test(type, InternalRowUtils.get(row, fieldIndex, type), literals);

diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/Or.java b/paimon-common/src/main/java/org/apache/paimon/predicate/Or.java
@@ -34,16 +34,6 @@ public class Or extends CompoundPredicate.Function {
 
     private Or() {}
 
-    @Override
-    public boolean test(Object[] values, List<Predicate> children) {
-        for (Predicate child : children) {
-            if (child.test(values)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public boolean test(InternalRow row, List<Predicate> children) {
         for (Predicate child : children) {

diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/Predicate.java b/paimon-common/src/main/java/org/apache/paimon/predicate/Predicate.java
@@ -34,13 +34,6 @@
 @Public
 public interface Predicate extends Serializable {
 
-    /**
-     * Test based on the specific input column values.
-     *
-     * @return return true when hit, false when not hit.
-     */
-    boolean test(Object[] values);
-
     /**
      * Test based on the specific input row.
      *

diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/PredicateFilter.java b/paimon-common/src/main/java/org/apache/paimon/predicate/PredicateFilter.java
diff --git a/paimon-common/src/test/java/org/apache/paimon/predicate/PredicateBuilderTest.java b/paimon-common/src/test/java/org/apache/paimon/predicate/PredicateBuilderTest.java
@@ -18,6 +18,7 @@
 
 package org.apache.paimon.predicate;
 
+import org.apache.paimon.data.GenericRow;
 import org.apache.paimon.format.FieldStats;
 import org.apache.paimon.types.IntType;
 import org.apache.paimon.types.RowType;
@@ -36,11 +37,11 @@ public void testBetween() {
         PredicateBuilder builder = new PredicateBuilder(RowType.of(new IntType()));
         Predicate predicate = builder.between(0, 1, 3);
 
-        assertThat(predicate.test(new Object[] {1})).isEqualTo(true);
-        assertThat(predicate.test(new Object[] {2})).isEqualTo(true);
-        assertThat(predicate.test(new Object[] {3})).isEqualTo(true);
-        assertThat(predicate.test(new Object[] {4})).isEqualTo(false);
-        assertThat(predicate.test(new Object[] {null})).isEqualTo(false);
+        assertThat(predicate.test(GenericRow.of(1))).isEqualTo(true);
+        assertThat(predicate.test(GenericRow.of(2))).isEqualTo(true);
+        assertThat(predicate.test(GenericRow.of(3))).isEqualTo(true);
+        assertThat(predicate.test(GenericRow.of(4))).isEqualTo(false);
+        assertThat(predicate.test(GenericRow.of((Object) null))).isEqualTo(false);
 
         assertThat(predicate.test(3, new FieldStats[] {new FieldStats(0, 5, 0L)})).isEqualTo(true);
         assertThat(predicate.test(3, new FieldStats[] {new FieldStats(2, 5, 0L)})).isEqualTo(true);
@@ -55,11 +56,11 @@ public void testBetweenNull() {
         PredicateBuilder builder = new PredicateBuilder(RowType.of(new IntType()));
         Predicate predicate = builder.between(0, 1, null);
 
-        assertThat(predicate.test(new Object[] {1})).isEqualTo(false);
-        assertThat(predicate.test(new Object[] {2})).isEqualTo(false);
-        assertThat(predicate.test(new Object[] {3})).isEqualTo(false);
-        assertThat(predicate.test(new Object[] {4})).isEqualTo(false);
-        assertThat(predicate.test(new Object[] {null})).isEqualTo(false);
+        assertThat(predicate.test(GenericRow.of(1))).isEqualTo(false);
+        assertThat(predicate.test(GenericRow.of(2))).isEqualTo(false);
+        assertThat(predicate.test(GenericRow.of(3))).isEqualTo(false);
+        assertThat(predicate.test(GenericRow.of(4))).isEqualTo(false);
+        assertThat(predicate.test(GenericRow.of((Object) null))).isEqualTo(false);
 
         assertThat(predicate.test(3, new FieldStats[] {new FieldStats(0, 5, 0L)})).isEqualTo(false);
         assertThat(predicate.test(3, new FieldStats[] {new FieldStats(2, 5, 0L)})).isEqualTo(false);