fix test

databendlabs · Dec 14, 2023 · b3b2d9a · b3b2d9a
1 parent 7da2cde
commit b3b2d9a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/query/service/src/interpreters/interpreter_merge_into_static_filter.rs b/src/query/service/src/interpreters/interpreter_merge_into_static_filter.rs
@@ -486,11 +486,8 @@ impl MergeIntoInterpreter {
         {
             SExpr::create_unary(
                 Arc::new(eval_source_side_join_expr_op.into()),
-                Arc::new(SExpr::create_unary(
-                    // there is another row_number operator here
-                    Arc::new(RelOperator::Exchange(common_sql::plans::Exchange::Merge)),
-                    Arc::new(source_plan.child(0)?.child(0)?.clone()),
-                )),
+                // there is another row_number operator here
+                Arc::new(source_plan.child(0)?.child(0)?.clone()),
             )
         } else {
             SExpr::create_unary(
@@ -522,8 +519,13 @@ impl MergeIntoInterpreter {
             limit: None,
             grouping_sets: None,
         };
-        let agg_final_sexpr =
-            SExpr::create_unary(Arc::new(agg_final_op.into()), Arc::new(agg_partial_sexpr));
+        let agg_final_sexpr = SExpr::create_unary(
+            Arc::new(agg_final_op.into()),
+            Arc::new(SExpr::create_unary(
+                Arc::new(RelOperator::Exchange(common_sql::plans::Exchange::Merge)),
+                Arc::new(agg_partial_sexpr),
+            )),
+        );
         Ok(Plan::Query {
             s_expr: Box::new(agg_final_sexpr),
             metadata: metadata.clone(),

diff --git a/...llogictests/suites/base/09_fuse_engine/09_0036_merge_into_without_distributed_enable.test b/...llogictests/suites/base/09_fuse_engine/09_0036_merge_into_without_distributed_enable.test
@@ -645,7 +645,7 @@ select count(*) from tt1;
 
 ## test issue #13367
 statement ok
-create table tt2(a bool, b variant, c map(string, string)) cluster by(a,c);
+create table tt2(a bool, b variant, c map(string, string)) cluster by(a);
 
 statement ok
 insert into tt2 values (true, '10', {'k1':'v1'}), (false, '20', {'k2':'v2'})