fix(query): ignore group_by_shuffle_mode in grouping set query (#18508)

* fix(query): exchange group_by_shuffle_mode with 'before_partial' should ignore the _grouping_id column

* fix

Author: sundy-li

src/query/sql/src/executor/physical_plans/physical_aggregate_final.rs

@@ -227,7 +227,11 @@ impl PhysicalPlanBuilder {
                     .collect::<Result<_>>()?;
 
                 let settings = self.ctx.get_settings();
-                let group_by_shuffle_mode = settings.get_group_by_shuffle_mode()?;
+                let mut group_by_shuffle_mode = settings.get_group_by_shuffle_mode()?;
+                if agg.grouping_sets.is_some() {
+                    group_by_shuffle_mode = "before_merge".to_string();
+                }
+
                 let enable_experimental_aggregate_hashtable =
                     settings.get_enable_experimental_aggregate_hashtable()?;
 

src/query/sql/src/planner/plans/aggregate.rs

@@ -339,7 +339,14 @@ impl Operator for Aggregate {
                     let settings = ctx.get_settings();
 
                     // Group aggregation, enforce `Hash` distribution
-                    match settings.get_group_by_shuffle_mode()?.as_str() {
+                    let mut group_by_shuffle_mode = settings.get_group_by_shuffle_mode()?;
+
+                    // Grouping set must be merged before_merge
+                    if self.grouping_sets.is_some() {
+                        group_by_shuffle_mode = "before_merge".to_string();
+                    }
+
+                    match group_by_shuffle_mode.as_str() {
                         "before_partial" => {
                             children_required.push(vec![RequiredProperty {
                                 distribution: Distribution::Hash(self.get_distribution_keys(true)?),

tests/sqllogictests/suites/tpcds/tpcds_agg.test

@@ -0,0 +1,13 @@
+statement ok
+set sandbox_tenant = 'test_tenant';
+
+statement ok
+use tpcds;
+
+statement ok
+set group_by_shuffle_mode = 'before_partial';
+
+include ./Q5
+
+statement ok
+UNSET group_by_shuffle_mode;