[fix](nereids) fix The children format needs to be [WhenClause+, Defa…

…ultValue?] (apache#38491) fix The children format needs to be [WhenClause+, DefaultValue?] (cherry picked from commit 21a3db6)
924060929 · Aug 2, 2024 · ae1ce9f · ae1ce9f
1 parent 5edcbd7
commit ae1ce9f
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/...in/java/org/apache/doris/nereids/trees/expressions/visitor/DefaultExpressionRewriter.java b/...in/java/org/apache/doris/nereids/trees/expressions/visitor/DefaultExpressionRewriter.java
@@ -18,6 +18,7 @@
 package org.apache.doris.nereids.trees.expressions.visitor;
 
 import org.apache.doris.nereids.trees.expressions.Expression;
+import org.apache.doris.nereids.trees.expressions.WhenClause;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,6 +34,13 @@ public Expression visit(Expression expr, C context) {
         return rewrite(this, expr, context);
     }
 
+    @Override
+    public Expression visitWhenClause(WhenClause whenClause, C context) {
+        // should not rewrite when clause to other expression because CaseWhen require WhenClause as children
+        return rewrite(this, whenClause, context);
+    }
+
+
     /** rewrite */
     public static final <C> Expression rewrite(ExpressionVisitor<Expression, C> rewriter, Expression expr, C context) {
         List<Expression> newChildren = new ArrayList<>();

diff --git a/regression-test/suites/nereids_syntax_p0/join.groovy b/regression-test/suites/nereids_syntax_p0/join.groovy
@@ -271,4 +271,42 @@ suite("join") {
         where
           ref_2.`id` is not NULL
     """
+
+    multi_sql """
+            drop table if exists table_test1;
+            drop table if exists table_test2;
+            
+            CREATE TABLE table_test1 (
+            id VARCHAR(20) NULL,
+            long1 BIGINT NULL,
+            long2 BIGINT NULL,
+            ) ENGINE=OLAP
+            DUPLICATE KEY(id)
+            COMMENT 'olap'
+            DISTRIBUTED BY HASH(id) BUCKETS AUTO
+            PROPERTIES (
+            "replication_allocation" = "tag.location.default: 1"
+            );
+            
+            CREATE TABLE table_test2 (
+            id VARCHAR(20) NULL,
+            re_long_4 BIGINT NULL,
+            ) ENGINE=OLAP
+            DUPLICATE KEY(id)
+            COMMENT 'olap'
+            DISTRIBUTED BY HASH(id) BUCKETS AUTO
+            PROPERTIES (
+            "replication_allocation" = "tag.location.default: 1"
+            ); 
+            
+            SELECT 1
+            from table_test1 b
+            WHERE (
+                CASE
+                WHEN b.long2=(SELECT re_long_4 FROM table_test2 limit 1) THEN (select long1 from table_test1 limit 1 )
+                WHEN b.long2=(SELECT re_long_4 FROM table_test2 limit 1) THEN (select long1 from table_test1 limit 1)
+                ELSE b.long2
+                END
+            )>0; 
+        """
 }