Desugar CUBE and ROLLUP into GROUPING SETS.

Author: RinChanNOWWW

src/query/ast/src/parser/token.rs

@@ -985,7 +985,7 @@ impl TokenKind {
             | TokenKind::FLOAT
             // | TokenKind::FOREIGN
             // | TokenKind::GREATEST
-            | TokenKind::GROUPING
+            // | TokenKind::GROUPING
             | TokenKind::CUBE
             | TokenKind::ROLLUP
             // | TokenKind::IFNULL

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

@@ -338,6 +338,24 @@ impl Binder {
                 self.resolve_grouping_sets(bind_context, select_list, sets, &available_aliases)
                     .await
             }
+            // TODO: avoid too many clones.
+            GroupBy::Rollup(exprs) => {
+                // ROLLUP (a,b,c) => GROUPING SETS ((a,b,c), (a,b), (a), ())
+                let mut sets = Vec::with_capacity(exprs.len() + 1);
+                for i in (0..=exprs.len()).rev() {
+                    sets.push(exprs[0..i].to_vec());
+                }
+                self.resolve_grouping_sets(bind_context, select_list, &sets, &available_aliases)
+                    .await
+            }
+            GroupBy::Cube(exprs) => {
+                // CUBE (a,b) => GROUPING SETS ((a,b),(a),(b),()) // All subsets
+                let sets = (0..=exprs.len())
+                    .flat_map(|count| exprs.clone().into_iter().combinations(count))
+                    .collect::<Vec<_>>();
+                self.resolve_grouping_sets(bind_context, select_list, &sets, &available_aliases)
+                    .await
+            }
         }
     }
 

tests/sqllogictests/suites/duckdb/sql/aggregate/group/group_by_grouping_sets.test

@@ -55,5 +55,41 @@ NULL B 10 0 1 2 1
 b NULL 11 1 0 1 2
 NULL NULL 18 1 1 3 3
 
+query TTIIIII
+select a, b, sum(c) as sc, grouping(b), grouping(a), grouping(a,b), grouping(b,a) from t group by grouping sets ((a,b),(a),()) order by sc;
+----
+a A 3 0 0 0 0
+a B 4 0 0 0 0
+b A 5 0 0 0 0
+b B 6 0 0 0 0
+a NULL 7 1 0 1 2
+b NULL 11 1 0 1 2
+NULL NULL 18 1 1 3 3
+
+
+query TTIIIII
+select a, b, sum(c) as sc, grouping(b), grouping(a), grouping(a,b), grouping(b,a) from t group by cube (a,b) order by sc;
+----
+a A 3 0 0 0 0
+a B 4 0 0 0 0
+b A 5 0 0 0 0
+b B 6 0 0 0 0
+a NULL 7 1 0 1 2
+NULL A 8 0 1 2 1
+NULL B 10 0 1 2 1
+b NULL 11 1 0 1 2
+NULL NULL 18 1 1 3 3
+
+query TTIIIII
+select a, b, sum(c) as sc, grouping(b), grouping(a), grouping(a,b), grouping(b,a) from t group by rollup (a,b) order by sc;
+----
+a A 3 0 0 0 0
+a B 4 0 0 0 0
+b A 5 0 0 0 0
+b B 6 0 0 0 0
+a NULL 7 1 0 1 2
+b NULL 11 1 0 1 2
+NULL NULL 18 1 1 3 3
+
 statement ok
 drop table t all;

tests/sqllogictests/suites/mode/standalone/explain/explain_grouping_sets.test

@@ -0,0 +1,57 @@
+query T
+explain select number % 2 as a, number % 3 as b, number % 5 as c from numbers(1) group by rollup(a, b, c);
+----
+EvalScalar
+├── expressions: [group_item (#1), group_item (#2), group_item (#3)]
+├── estimated rows: 1.00
+└── AggregateFinal
+    ├── group by: [a, b, c, _grouping_id]
+    ├── aggregate functions: []
+    ├── estimated rows: 1.00
+    └── AggregatePartial
+        ├── group by: [a, b, c, _grouping_id]
+        ├── aggregate functions: []
+        ├── estimated rows: 1.00
+        └── AggregateExpand
+            ├── grouping sets: [(a, b, c), (a, b), (a), ()]
+            ├── estimated rows: 1.00
+            └── EvalScalar
+                ├── expressions: [numbers.number (#0) % 2, numbers.number (#0) % 3, numbers.number (#0) % 5]
+                ├── estimated rows: 1.00
+                └── TableScan
+                    ├── table: default.system.numbers
+                    ├── read rows: 1
+                    ├── read bytes: 8
+                    ├── partitions total: 1
+                    ├── partitions scanned: 1
+                    ├── push downs: [filters: [], limit: NONE]
+                    └── estimated rows: 1.00
+
+query T
+explain select number % 2 as a, number % 3 as b, number % 5 as c from numbers(1) group by cube(a, b, c);
+----
+EvalScalar
+├── expressions: [group_item (#1), group_item (#2), group_item (#3)]
+├── estimated rows: 1.00
+└── AggregateFinal
+    ├── group by: [a, b, c, _grouping_id]
+    ├── aggregate functions: []
+    ├── estimated rows: 1.00
+    └── AggregatePartial
+        ├── group by: [a, b, c, _grouping_id]
+        ├── aggregate functions: []
+        ├── estimated rows: 1.00
+        └── AggregateExpand
+            ├── grouping sets: [(), (a), (b), (c), (a, b), (a, c), (b, c), (a, b, c)]
+            ├── estimated rows: 1.00
+            └── EvalScalar
+                ├── expressions: [numbers.number (#0) % 2, numbers.number (#0) % 3, numbers.number (#0) % 5]
+                ├── estimated rows: 1.00
+                └── TableScan
+                    ├── table: default.system.numbers
+                    ├── read rows: 1
+                    ├── read bytes: 8
+                    ├── partitions total: 1
+                    ├── partitions scanned: 1
+                    ├── push downs: [filters: [], limit: NONE]
+                    └── estimated rows: 1.00