[core] Refactor LeafFunction fromJson and toJson

JingsongLi · JingsongLi · commit b6adddfff39a · 2026-02-05T11:01:26.000+08:00
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/Between.java b/paimon-common/src/main/java/org/apache/paimon/predicate/Between.java
@@ -67,4 +67,9 @@ public Optional<LeafFunction> negate() {
     public <T> T visit(FunctionVisitor<T> visitor, FieldRef fieldRef, List<Object> literals) {
         return visitor.visitBetween(fieldRef, literals.get(0), literals.get(1));
     }
+
+    @Override
+    public String toJson() {
+        return NAME;
+    }
 }
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/Contains.java b/paimon-common/src/main/java/org/apache/paimon/predicate/Contains.java
@@ -26,8 +26,8 @@
 import java.util.List;
 import java.util.Optional;
 
-/** A {@link NullFalseLeafBinaryFunction} to evaluate {@code filter like '%abc%'}. */
-public class Contains extends NullFalseLeafBinaryFunction {
+/** A {@link LeafBinaryFunction} to evaluate {@code filter like '%abc%'}. */
+public class Contains extends LeafBinaryFunction {
 
     public static final String NAME = "CONTAINS";
 
@@ -62,4 +62,9 @@ public Optional<LeafFunction> negate() {
     public <T> T visit(FunctionVisitor<T> visitor, FieldRef fieldRef, List<Object> literals) {
         return visitor.visitContains(fieldRef, literals.get(0));
     }
+
+    @Override
+    public String toJson() {
+        return NAME;
+    }
 }
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/EndsWith.java b/paimon-common/src/main/java/org/apache/paimon/predicate/EndsWith.java
@@ -26,11 +26,8 @@
 import java.util.List;
 import java.util.Optional;
 
-/**
- * A {@link NullFalseLeafBinaryFunction} to evaluate {@code filter like '%abc' or filter like
- * '_abc'}.
- */
-public class EndsWith extends NullFalseLeafBinaryFunction {
+/** A {@link LeafBinaryFunction} to evaluate {@code filter like '%abc' or filter like '_abc'}. */
+public class EndsWith extends LeafBinaryFunction {
 
     public static final String NAME = "ENDS_WITH";
 
@@ -65,4 +62,9 @@ public Optional<LeafFunction> negate() {
     public <T> T visit(FunctionVisitor<T> visitor, FieldRef fieldRef, List<Object> literals) {
         return visitor.visitEndsWith(fieldRef, literals.get(0));
     }
+
+    @Override
+    public String toJson() {
+        return NAME;
+    }
 }
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/Equal.java b/paimon-common/src/main/java/org/apache/paimon/predicate/Equal.java
@@ -27,8 +27,8 @@
 
 import static org.apache.paimon.predicate.CompareUtils.compareLiteral;
 
-/** A {@link NullFalseLeafBinaryFunction} to eval equal. */
-public class Equal extends NullFalseLeafBinaryFunction {
+/** A {@link LeafBinaryFunction} to eval equal. */
+public class Equal extends LeafBinaryFunction {
 
     public static final String NAME = "EQUAL";
 
@@ -57,4 +57,9 @@ public Optional<LeafFunction> negate() {
     public <T> T visit(FunctionVisitor<T> visitor, FieldRef fieldRef, List<Object> literals) {
         return visitor.visitEqual(fieldRef, literals.get(0));
     }
+
+    @Override
+    public String toJson() {
+        return NAME;
+    }
 }
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/GreaterOrEqual.java b/paimon-common/src/main/java/org/apache/paimon/predicate/GreaterOrEqual.java
@@ -27,8 +27,8 @@
 
 import static org.apache.paimon.predicate.CompareUtils.compareLiteral;
 
-/** A {@link NullFalseLeafBinaryFunction} to eval greater or equal. */
-public class GreaterOrEqual extends NullFalseLeafBinaryFunction {
+/** A {@link LeafBinaryFunction} to eval greater or equal. */
+public class GreaterOrEqual extends LeafBinaryFunction {
 
     public static final String NAME = "GREATER_OR_EQUAL";
 
@@ -57,4 +57,9 @@ public Optional<LeafFunction> negate() {
     public <T> T visit(FunctionVisitor<T> visitor, FieldRef fieldRef, List<Object> literals) {
         return visitor.visitGreaterOrEqual(fieldRef, literals.get(0));
     }
+
+    @Override
+    public String toJson() {
+        return NAME;
+    }
 }
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/GreaterThan.java b/paimon-common/src/main/java/org/apache/paimon/predicate/GreaterThan.java
@@ -28,7 +28,7 @@
 import static org.apache.paimon.predicate.CompareUtils.compareLiteral;
 
 /** A {@link LeafFunction} to eval greater. */
-public class GreaterThan extends NullFalseLeafBinaryFunction {
+public class GreaterThan extends LeafBinaryFunction {
 
     public static final String NAME = "GREATER_THAN";
 
@@ -57,4 +57,9 @@ public Optional<LeafFunction> negate() {
     public <T> T visit(FunctionVisitor<T> visitor, FieldRef fieldRef, List<Object> literals) {
         return visitor.visitGreaterThan(fieldRef, literals.get(0));
     }
+
+    @Override
+    public String toJson() {
+        return NAME;
+    }
 }
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/In.java b/paimon-common/src/main/java/org/apache/paimon/predicate/In.java
@@ -28,7 +28,7 @@
 import static org.apache.paimon.predicate.CompareUtils.compareLiteral;
 
 /** A {@link LeafFunction} to eval in. */
-public class In extends LeafFunction {
+public class In extends LeafNAryFunction {
 
     private static final long serialVersionUID = 1L;
 
@@ -82,4 +82,9 @@ public Optional<LeafFunction> negate() {
     public <T> T visit(FunctionVisitor<T> visitor, FieldRef fieldRef, List<Object> literals) {
         return visitor.visitIn(fieldRef, literals);
     }
+
+    @Override
+    public String toJson() {
+        return NAME;
+    }
 }
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/IsNotNull.java b/paimon-common/src/main/java/org/apache/paimon/predicate/IsNotNull.java
@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Optional;
 
-/** A {@link NullFalseLeafBinaryFunction} to eval is not null. */
+/** A {@link LeafBinaryFunction} to eval is not null. */
 public class IsNotNull extends LeafUnaryFunction {
 
     public static final String NAME = "IS_NOT_NULL";
@@ -45,6 +45,11 @@ public boolean test(DataType type, long rowCount, Object min, Object max, Long n
         return nullCount == null || nullCount < rowCount;
     }
 
+    @Override
+    public String toJson() {
+        return NAME;
+    }
+
     @Override
     public Optional<LeafFunction> negate() {
         return Optional.of(IsNull.INSTANCE);
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/IsNull.java b/paimon-common/src/main/java/org/apache/paimon/predicate/IsNull.java
@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Optional;
 
-/** A {@link NullFalseLeafBinaryFunction} to eval is null. */
+/** A {@link LeafBinaryFunction} to eval is null. */
 public class IsNull extends LeafUnaryFunction {
 
     public static final String NAME = "IS_NULL";
@@ -54,4 +54,9 @@ public Optional<LeafFunction> negate() {
     public <T> T visit(FunctionVisitor<T> visitor, FieldRef fieldRef, List<Object> literals) {
         return visitor.visitIsNull(fieldRef);
     }
+
+    @Override
+    public String toJson() {
+        return NAME;
+    }
 }
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/LeafBinaryFunction.java b/paimon-common/src/main/java/org/apache/paimon/predicate/LeafBinaryFunction.java
@@ -23,7 +23,7 @@
 import java.util.List;
 
 /** Function to test a field with a literal. */
-public abstract class NullFalseLeafBinaryFunction extends LeafFunction {
+public abstract class LeafBinaryFunction extends LeafFunction {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/LeafFunction.java b/paimon-common/src/main/java/org/apache/paimon/predicate/LeafFunction.java
@@ -25,93 +25,56 @@
 
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 /** Function to test a field with literals. */
 public abstract class LeafFunction implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     @JsonCreator
     public static LeafFunction fromJson(String name) throws IOException {
-        switch (name) {
-            case Equal.NAME:
-                return Equal.INSTANCE;
-            case NotEqual.NAME:
-                return NotEqual.INSTANCE;
-            case LessThan.NAME:
-                return LessThan.INSTANCE;
-            case LessOrEqual.NAME:
-                return LessOrEqual.INSTANCE;
-            case GreaterThan.NAME:
-                return GreaterThan.INSTANCE;
-            case GreaterOrEqual.NAME:
-                return GreaterOrEqual.INSTANCE;
-            case IsNull.NAME:
-                return IsNull.INSTANCE;
-            case IsNotNull.NAME:
-                return IsNotNull.INSTANCE;
-            case StartsWith.NAME:
-                return StartsWith.INSTANCE;
-            case EndsWith.NAME:
-                return EndsWith.INSTANCE;
-            case Contains.NAME:
-                return Contains.INSTANCE;
-            case Like.NAME:
-                return Like.INSTANCE;
-            case In.NAME:
-                return In.INSTANCE;
-            case NotIn.NAME:
-                return NotIn.INSTANCE;
-            case Between.NAME:
-                return Between.INSTANCE;
-            case NotBetween.NAME:
-                return NotBetween.INSTANCE;
-            default:
-                throw new IllegalArgumentException(
-                        "Could not resolve leaf function '" + name + "'");
+        LeafFunction function = RegistryHolder.REGISTRY.get(name);
+        if (function == null) {
+            throw new IllegalArgumentException("Could not resolve leaf function '" + name + "'");
         }
+        return function;
     }
 
-    @JsonValue
-    public String toJson() {
-        if (this instanceof Equal) {
-            return Equal.NAME;
-        } else if (this instanceof NotEqual) {
-            return NotEqual.NAME;
-        } else if (this instanceof LessThan) {
-            return LessThan.NAME;
-        } else if (this instanceof LessOrEqual) {
-            return LessOrEqual.NAME;
-        } else if (this instanceof GreaterThan) {
-            return GreaterThan.NAME;
-        } else if (this instanceof GreaterOrEqual) {
-            return GreaterOrEqual.NAME;
-        } else if (this instanceof IsNull) {
-            return IsNull.NAME;
-        } else if (this instanceof IsNotNull) {
-            return IsNotNull.NAME;
-        } else if (this instanceof StartsWith) {
-            return StartsWith.NAME;
-        } else if (this instanceof EndsWith) {
-            return EndsWith.NAME;
-        } else if (this instanceof Contains) {
-            return Contains.NAME;
-        } else if (this instanceof Like) {
-            return Like.NAME;
-        } else if (this instanceof In) {
-            return In.NAME;
-        } else if (this instanceof NotIn) {
-            return NotIn.NAME;
-        } else if (this instanceof Between) {
-            return Between.NAME;
-        } else if (this instanceof NotBetween) {
-            return NotBetween.NAME;
-        } else {
-            throw new IllegalArgumentException(
-                    "Unknown leaf function class for JSON serialization: " + getClass());
+    /** Holder class for lazy initialization of the registry to avoid class loading deadlock. */
+    private static class RegistryHolder {
+
+        private static final Map<String, LeafFunction> REGISTRY = createRegistry();
+
+        private static Map<String, LeafFunction> createRegistry() {
+            Map<String, LeafFunction> registry = new HashMap<>();
+            registry.put(Equal.NAME, Equal.INSTANCE);
+            registry.put(NotEqual.NAME, NotEqual.INSTANCE);
+            registry.put(LessThan.NAME, LessThan.INSTANCE);
+            registry.put(LessOrEqual.NAME, LessOrEqual.INSTANCE);
+            registry.put(GreaterThan.NAME, GreaterThan.INSTANCE);
+            registry.put(GreaterOrEqual.NAME, GreaterOrEqual.INSTANCE);
+            registry.put(IsNull.NAME, IsNull.INSTANCE);
+            registry.put(IsNotNull.NAME, IsNotNull.INSTANCE);
+            registry.put(StartsWith.NAME, StartsWith.INSTANCE);
+            registry.put(EndsWith.NAME, EndsWith.INSTANCE);
+            registry.put(Contains.NAME, Contains.INSTANCE);
+            registry.put(Like.NAME, Like.INSTANCE);
+            registry.put(In.NAME, In.INSTANCE);
+            registry.put(NotIn.NAME, NotIn.INSTANCE);
+            registry.put(Between.NAME, Between.INSTANCE);
+            registry.put(NotBetween.NAME, NotBetween.INSTANCE);
+            return Collections.unmodifiableMap(registry);
         }
     }
 
+    @JsonValue
+    public abstract String toJson();
+
     public abstract boolean test(DataType type, Object field, List<Object> literals);
 
     public abstract boolean test(
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/LeafNAryFunction.java b/paimon-common/src/main/java/org/apache/paimon/predicate/LeafNAryFunction.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.paimon.predicate;
+
+/** Abstract {@link LeafFunction} for n-ary function. */
+public abstract class LeafNAryFunction extends LeafFunction {
+
+    private static final long serialVersionUID = 1L;
+}
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/LeafTernaryFunction.java b/paimon-common/src/main/java/org/apache/paimon/predicate/LeafTernaryFunction.java
@@ -25,6 +25,8 @@
 /** Abstract {@link LeafFunction} for ternary function. */
 public abstract class LeafTernaryFunction extends LeafFunction {
 
+    private static final long serialVersionUID = 1L;
+
     public abstract boolean test(DataType type, Object field, Object literal1, Object literal2);
 
     public abstract boolean test(
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/LessOrEqual.java b/paimon-common/src/main/java/org/apache/paimon/predicate/LessOrEqual.java
@@ -27,8 +27,8 @@
 
 import static org.apache.paimon.predicate.CompareUtils.compareLiteral;
 
-/** A {@link NullFalseLeafBinaryFunction} to eval less or equal. */
-public class LessOrEqual extends NullFalseLeafBinaryFunction {
+/** A {@link LeafBinaryFunction} to eval less or equal. */
+public class LessOrEqual extends LeafBinaryFunction {
 
     public static final String NAME = "LESS_OR_EQUAL";
 
@@ -57,4 +57,9 @@ public Optional<LeafFunction> negate() {
     public <T> T visit(FunctionVisitor<T> visitor, FieldRef fieldRef, List<Object> literals) {
         return visitor.visitLessOrEqual(fieldRef, literals.get(0));
     }
+
+    @Override
+    public String toJson() {
+        return NAME;
+    }
 }
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/LessThan.java b/paimon-common/src/main/java/org/apache/paimon/predicate/LessThan.java
@@ -27,8 +27,8 @@
 
 import static org.apache.paimon.predicate.CompareUtils.compareLiteral;
 
-/** A {@link NullFalseLeafBinaryFunction} to eval less or equal. */
-public class LessThan extends NullFalseLeafBinaryFunction {
+/** A {@link LeafBinaryFunction} to eval less or equal. */
+public class LessThan extends LeafBinaryFunction {
 
     public static final String NAME = "LESS_THAN";
 
@@ -57,4 +57,9 @@ public Optional<LeafFunction> negate() {
     public <T> T visit(FunctionVisitor<T> visitor, FieldRef fieldRef, List<Object> literals) {
         return visitor.visitLessThan(fieldRef, literals.get(0));
     }
+
+    @Override
+    public String toJson() {
+        return NAME;
+    }
 }
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/Like.java b/paimon-common/src/main/java/org/apache/paimon/predicate/Like.java
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/LikeOptimization.java b/paimon-common/src/main/java/org/apache/paimon/predicate/LikeOptimization.java
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/NotBetween.java b/paimon-common/src/main/java/org/apache/paimon/predicate/NotBetween.java
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/NotEqual.java b/paimon-common/src/main/java/org/apache/paimon/predicate/NotEqual.java
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/NotIn.java b/paimon-common/src/main/java/org/apache/paimon/predicate/NotIn.java
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/PredicateBuilder.java b/paimon-common/src/main/java/org/apache/paimon/predicate/PredicateBuilder.java
diff --git a/paimon-common/src/main/java/org/apache/paimon/predicate/StartsWith.java b/paimon-common/src/main/java/org/apache/paimon/predicate/StartsWith.java

Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,9 @@ public Optional<LeafFunction> negate() {`
`67`	`67`	`public <T> T visit(FunctionVisitor<T> visitor, FieldRef fieldRef, List<Object> literals) {`
`68`	`68`	`return visitor.visitBetween(fieldRef, literals.get(0), literals.get(1));`
`69`	`69`	`}`
	`70`	`+`
	`71`	`+ @Override`
	`72`	`+ public String toJson() {`
	`73`	`+ return NAME;`
	`74`	`+ }`
`70`	`75`	`}`