From 9d8043e4c14ed82dcfcec2520171014615c50a07 Mon Sep 17 00:00:00 2001
From: mch_ucchi <41606806+sohardforaname@users.noreply.github.com>
Date: Fri, 2 Jun 2023 10:33:11 +0800
Subject: [PATCH] [Fix](Nereids) should not gather data when sink (#20330)

---
 .../doris/nereids/glue/translator/PhysicalPlanTranslator.java | 2 +-
 .../suites/nereids_p0/insert_into_table/aggregate.groovy      | 1 +
 .../suites/nereids_p0/insert_into_table/complex_insert.groovy | 1 +
 .../suites/nereids_p0/insert_into_table/duplicate.groovy      | 1 +
 .../suites/nereids_p0/insert_into_table/no_partition.groovy   | 1 +
 .../nereids_p0/insert_into_table/type_cast_aggregate.groovy   | 1 +
 .../nereids_p0/insert_into_table/type_cast_duplicate.groovy   | 1 +
 .../nereids_p0/insert_into_table/type_cast_unique.groovy      | 1 +
 .../suites/nereids_p0/insert_into_table/unique.groovy         | 1 +
 .../suites/nereids_p0/insert_into_table/unsupport_type.groovy | 4 ++--
 10 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
index 224b1763aa..c9f9543bf2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
@@ -286,7 +286,7 @@ public class PhysicalPlanTranslator extends DefaultPlanVisitor<PlanFragment, Pla
             rootFragment = currentFragment;
         }
 
-        if (isFragmentPartitioned(rootFragment)) {
+        if (!(physicalPlan instanceof PhysicalOlapTableSink) && isFragmentPartitioned(rootFragment)) {
             rootFragment = exchangeToMergeFragment(rootFragment, context);
         }
 
diff --git a/regression-test/suites/nereids_p0/insert_into_table/aggregate.groovy b/regression-test/suites/nereids_p0/insert_into_table/aggregate.groovy
index 7b3b483b9c..d151cf43c2 100644
--- a/regression-test/suites/nereids_p0/insert_into_table/aggregate.groovy
+++ b/regression-test/suites/nereids_p0/insert_into_table/aggregate.groovy
@@ -21,6 +21,7 @@ suite("nereids_insert_aggregate") {
 
     sql 'set enable_nereids_planner=true'
     sql 'set enable_fallback_to_original_planner=false'
+    sql 'set enable_nereids_dml=true'
     sql 'set parallel_fragment_exec_instance_num=13'
 
     sql '''insert into nereids_insert_into_table_test.agg_t
diff --git a/regression-test/suites/nereids_p0/insert_into_table/complex_insert.groovy b/regression-test/suites/nereids_p0/insert_into_table/complex_insert.groovy
index d7b8072147..7533fabf90 100644
--- a/regression-test/suites/nereids_p0/insert_into_table/complex_insert.groovy
+++ b/regression-test/suites/nereids_p0/insert_into_table/complex_insert.groovy
@@ -18,6 +18,7 @@
 suite('complex_insert') {
     sql 'set enable_nereids_planner=true'
     sql 'set enable_fallback_to_original_planner=false'
+    sql 'set enable_nereids_dml=true'
     sql 'set parallel_fragment_exec_instance_num=13'
 
     sql 'use nereids_insert_into_table_test'
diff --git a/regression-test/suites/nereids_p0/insert_into_table/duplicate.groovy b/regression-test/suites/nereids_p0/insert_into_table/duplicate.groovy
index bc11b049de..0a8fabae08 100644
--- a/regression-test/suites/nereids_p0/insert_into_table/duplicate.groovy
+++ b/regression-test/suites/nereids_p0/insert_into_table/duplicate.groovy
@@ -21,6 +21,7 @@ suite("nereids_insert_duplicate") {
 
     sql 'set enable_nereids_planner=true'
     sql 'set enable_fallback_to_original_planner=false'
+    sql 'set enable_nereids_dml=true'
     sql 'set parallel_fragment_exec_instance_num=13'
 
     sql '''insert into dup_t
diff --git a/regression-test/suites/nereids_p0/insert_into_table/no_partition.groovy b/regression-test/suites/nereids_p0/insert_into_table/no_partition.groovy
index 5e149e823e..ba9c028cce 100644
--- a/regression-test/suites/nereids_p0/insert_into_table/no_partition.groovy
+++ b/regression-test/suites/nereids_p0/insert_into_table/no_partition.groovy
@@ -21,6 +21,7 @@ suite('nereids_insert_no_partition') {
 
     sql 'set enable_nereids_planner=true'
     sql 'set enable_fallback_to_original_planner=false'
+    sql 'set enable_nereids_dml=true'
     sql 'set parallel_fragment_exec_instance_num=13'
 
     sql '''insert into agg_nop_t
diff --git a/regression-test/suites/nereids_p0/insert_into_table/type_cast_aggregate.groovy b/regression-test/suites/nereids_p0/insert_into_table/type_cast_aggregate.groovy
index a6690c23bd..c3fbf3df64 100644
--- a/regression-test/suites/nereids_p0/insert_into_table/type_cast_aggregate.groovy
+++ b/regression-test/suites/nereids_p0/insert_into_table/type_cast_aggregate.groovy
@@ -21,6 +21,7 @@ suite("nereids_insert_aggregate_type_cast") {
 
     sql 'set enable_nereids_planner=true'
     sql 'set enable_fallback_to_original_planner=false'
+    sql 'set enable_nereids_dml=true'
     sql 'set parallel_fragment_exec_instance_num=13'
 
     sql '''insert into agg_t_type_cast
diff --git a/regression-test/suites/nereids_p0/insert_into_table/type_cast_duplicate.groovy b/regression-test/suites/nereids_p0/insert_into_table/type_cast_duplicate.groovy
index a0579b3a54..9f87e4aa51 100644
--- a/regression-test/suites/nereids_p0/insert_into_table/type_cast_duplicate.groovy
+++ b/regression-test/suites/nereids_p0/insert_into_table/type_cast_duplicate.groovy
@@ -21,6 +21,7 @@ suite("nereids_insert_duplicate") {
 
     sql 'set enable_nereids_planner=true'
     sql 'set enable_fallback_to_original_planner=false'
+    sql 'set enable_nereids_dml=true'
     sql 'set parallel_fragment_exec_instance_num=13'
 
     sql '''insert into dup_t_type_cast
diff --git a/regression-test/suites/nereids_p0/insert_into_table/type_cast_unique.groovy b/regression-test/suites/nereids_p0/insert_into_table/type_cast_unique.groovy
index 2cb5e4f604..e65c1acb7e 100644
--- a/regression-test/suites/nereids_p0/insert_into_table/type_cast_unique.groovy
+++ b/regression-test/suites/nereids_p0/insert_into_table/type_cast_unique.groovy
@@ -21,6 +21,7 @@ suite("nereids_insert_unique_type_cast") {
 
     sql 'set enable_nereids_planner=true'
     sql 'set enable_fallback_to_original_planner=false'
+    sql 'set enable_nereids_dml=true'
     sql 'set parallel_fragment_exec_instance_num=13'
 
     sql '''insert into uni_t_type_cast
diff --git a/regression-test/suites/nereids_p0/insert_into_table/unique.groovy b/regression-test/suites/nereids_p0/insert_into_table/unique.groovy
index 8b62cba8ae..0080a35aa1 100644
--- a/regression-test/suites/nereids_p0/insert_into_table/unique.groovy
+++ b/regression-test/suites/nereids_p0/insert_into_table/unique.groovy
@@ -21,6 +21,7 @@ suite("nereids_insert_unique") {
 
     sql 'set enable_nereids_planner=true'
     sql 'set enable_fallback_to_original_planner=false'
+    sql 'set enable_nereids_dml=true'
     sql 'set parallel_fragment_exec_instance_num=13'
 
     sql '''insert into uni_t
diff --git a/regression-test/suites/nereids_p0/insert_into_table/unsupport_type.groovy b/regression-test/suites/nereids_p0/insert_into_table/unsupport_type.groovy
index f5bfa74e53..515a7dbdf2 100644
--- a/regression-test/suites/nereids_p0/insert_into_table/unsupport_type.groovy
+++ b/regression-test/suites/nereids_p0/insert_into_table/unsupport_type.groovy
@@ -20,12 +20,12 @@ suite("nereids_insert_array_type") {
 
     sql 'set enable_nereids_planner=true'
     sql 'set enable_fallback_to_original_planner=false'
+    sql 'set enable_nereids_dml=true'
     sql 'set parallel_fragment_exec_instance_num=13'
 
     test {
         sql 'insert into arr_t select id, kaint from src'
-        // exception 'type ARRAY<INT> is unsupported for Nereids'
-        exception null
+        exception 'type ARRAY<INT> is unsupported for Nereids'
     }
 
     sql 'set enable_fallback_to_original_planner=true'