Revert "[branch 52] Fix grouping set subset satisfaction (apache#19855)"

This reverts commit eb00fe2.

Author: alamb

datafusion/physical-optimizer/src/enforce_distribution.rs

@@ -36,7 +36,7 @@ use datafusion_common::config::ConfigOptions;
 use datafusion_common::error::Result;
 use datafusion_common::stats::Precision;
 use datafusion_common::tree_node::{Transformed, TransformedResult, TreeNode};
-use datafusion_expr::logical_plan::{Aggregate, JoinType};
+use datafusion_expr::logical_plan::JoinType;
 use datafusion_physical_expr::expressions::{Column, NoOp};
 use datafusion_physical_expr::utils::map_columns_before_projection;
 use datafusion_physical_expr::{
@@ -1297,25 +1297,10 @@ pub fn ensure_distribution(
             // Allow subset satisfaction when:
             // 1. Current partition count >= threshold
             // 2. Not a partitioned join since must use exact hash matching for joins
-            // 3. Not a grouping set aggregate (requires exact hash including __grouping_id)
             let current_partitions = child.plan.output_partitioning().partition_count();
-
-            // Check if the hash partitioning requirement includes __grouping_id column.
-            // Grouping set aggregates (ROLLUP, CUBE, GROUPING SETS) require exact hash
-            // partitioning on all group columns including __grouping_id to ensure partial
-            // aggregates from different partitions are correctly combined.
-            let requires_grouping_id = matches!(&requirement, Distribution::HashPartitioned(exprs)
-                if exprs.iter().any(|expr| {
-                    expr.as_any()
-                        .downcast_ref::<Column>()
-                        .is_some_and(|col| col.name() == Aggregate::INTERNAL_GROUPING_ID)
-                })
-            );
-
             let allow_subset_satisfy_partitioning = current_partitions
                 >= subset_satisfaction_threshold
-                && !is_partitioned_join
-                && !requires_grouping_id;
+                && !is_partitioned_join;
 
             // When `repartition_file_scans` is set, attempt to increase
             // parallelism at the source.