[enhancement](paimon)support predict for null and notnull (apache#29134)

HappenLee · Jan 12, 2024 · 12629b0 · 12629b0
1 parent 6cecb5f
commit 12629b0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/...core/src/main/java/org/apache/doris/planner/external/paimon/PaimonPredicateConverter.java b/...core/src/main/java/org/apache/doris/planner/external/paimon/PaimonPredicateConverter.java
@@ -21,6 +21,7 @@
 import org.apache.doris.analysis.CompoundPredicate;
 import org.apache.doris.analysis.Expr;
 import org.apache.doris.analysis.FunctionCallExpr;
+import org.apache.doris.analysis.IsNullPredicate;
 import org.apache.doris.analysis.LiteralExpr;
 import org.apache.doris.analysis.SlotRef;
 import org.apache.doris.thrift.TExprOpcode;
@@ -70,10 +71,16 @@ public Predicate convertToPaimonExpr(Expr dorisExpr) {
 
             switch (compoundPredicate.getOp()) {
                 case AND: {
-                    return PredicateBuilder.and(left, right);
+                    if (left != null && right != null) {
+                        return PredicateBuilder.and(left, right);
+                    }
+                    return null;
                 }
                 case OR: {
-                    return PredicateBuilder.or(left, right);
+                    if (left != null && right != null) {
+                        return PredicateBuilder.or(left, right);
+                    }
+                    return null;
                 }
                 default:
                     return null;
@@ -120,6 +127,12 @@ private Predicate binaryExprDesc(Expr dorisExpr) {
                     if (name.equals("like") && !s.startsWith("%") && s.endsWith("%")) {
                         return builder.startsWith(idx, BinaryString.fromString(s.substring(0, s.length() - 1)));
                     }
+                } else if (dorisExpr instanceof IsNullPredicate) {
+                    if (((IsNullPredicate) dorisExpr).isNotNull()) {
+                        return builder.isNotNull(idx);
+                    } else {
+                        return builder.isNull(idx);
+                    }
                 }
                 return null;
             default:

diff --git a/regression-test/data/external_table_p0/paimon/test_paimon_catalog.out b/regression-test/data/external_table_p0/paimon/test_paimon_catalog.out
diff --git a/regression-test/suites/external_table_p0/paimon/test_paimon_catalog.groovy b/regression-test/suites/external_table_p0/paimon/test_paimon_catalog.groovy
@@ -166,6 +166,8 @@ suite("test_paimon_catalog", "p0,external,doris,external_docker,external_docker_
 
             def c100= """select * from array_nested order by c1;"""
 
+            def c101="""select * from all_table where c1 is not null or c2 is not null order by c1"""
+
             String hdfs_port = context.config.otherConfigs.get("hdfs_port")
             String catalog_name = "paimon1"
             String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
@@ -284,6 +286,7 @@ suite("test_paimon_catalog", "p0,external,doris,external_docker,external_docker_
             qt_c98 c98
             qt_c99 c99
             qt_c100 c100
+            qt_c101 c101
 
             // test view from jion paimon
             sql """ switch internal """