Fix: grouping sets missing.

Author: RinChanNOWWW

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

@@ -542,6 +542,11 @@ impl Binder {
             );
         }
 
+        // If it's `GROUP BY GROUPING SETS`, ignore the optimization below.
+        if collect_grouping_sets {
+            return Ok(());
+        }
+
         // Remove dependent group items, group by a, f(a, b), f(a), b ---> group by a,b
         let mut results = vec![];
         for item in bind_context.aggregate_info.group_items.iter() {

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

@@ -4,6 +4,21 @@ select (number % 2) as a from numbers(5) group by grouping sets (a) order by a;
 0
 1
 
+query TT
+select number % 2 as a, number % 3 as b from numbers(24) group by grouping sets ((a,b), (a), (b)) order by a,b;
+----
+0 0
+0 1
+0 2
+0 NULL
+1 0
+1 1
+1 2
+1 NULL
+NULL 0
+NULL 1
+NULL 2
+
 
 statement ok
 drop table if exists t;
@@ -41,4 +56,4 @@ b NULL 11 1 0 1 2
 NULL NULL 18 1 1 3 3
 
 statement ok
-drop table t all;
+drop table t all;

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

@@ -81,7 +81,7 @@ Limit
             ├── aggregate functions: []
             ├── estimated rows: 0.33
             └── Filter
-                ├── filters: [is_true(CAST(t.number (#0) AS UInt64 NULL) = TRY_CAST(if(CAST(is_not_null(scalar_subquery_5 (#5)) AS Boolean NULL), CAST(CATCH(scalar_subquery_5 (#5)) AS Tuple(Int64 NULL, String NULL)), (0, NULL)) AS UInt64 NULL))]
+                ├── filters: [is_true(CAST(t.number (#0) AS UInt64 NULL) = TRY_CAST(if(CAST(is_not_null(scalar_subquery_5 (#5)) AS Boolean NULL), CAST(scalar_subquery_5 (#5) AS Int64 NULL), 0) AS UInt64 NULL))]
                 ├── estimated rows: 0.33
                 └── HashJoin
                     ├── join type: SINGLE

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

@@ -99,10 +99,10 @@ Filter
 ├── estimated rows: 0.00
 └── TableScan
     ├── table: default.system.numbers
-    ├── read rows: 1
-    ├── read bytes: 8
-    ├── partitions total: 1
-    ├── partitions scanned: 1
+    ├── read rows: 0
+    ├── read bytes: 0
+    ├── partitions total: 0
+    ├── partitions scanned: 0
     ├── push downs: [filters: [false], limit: NONE]
     └── estimated rows: 1.00
 
@@ -114,10 +114,10 @@ Filter
 ├── estimated rows: 0.00
 └── TableScan
     ├── table: default.system.numbers
-    ├── read rows: 1
-    ├── read bytes: 8
-    ├── partitions total: 1
-    ├── partitions scanned: 1
+    ├── read rows: 0
+    ├── read bytes: 0
+    ├── partitions total: 0
+    ├── partitions scanned: 0
     ├── push downs: [filters: [false], limit: NONE]
     └── estimated rows: 1.00
 
@@ -129,10 +129,10 @@ Filter
 ├── estimated rows: 0.00
 └── TableScan
     ├── table: default.system.numbers
-    ├── read rows: 1
-    ├── read bytes: 8
-    ├── partitions total: 1
-    ├── partitions scanned: 1
+    ├── read rows: 0
+    ├── read bytes: 0
+    ├── partitions total: 0
+    ├── partitions scanned: 0
     ├── push downs: [filters: [false], limit: NONE]
     └── estimated rows: 1.00
 

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

@@ -2,7 +2,7 @@ query T
 explain select t.number from numbers(1) as t, numbers(1) as t1 where t.number = (select count(*) from numbers(1) as t2, numbers(1) as t3 where t.number = t2.number)
 ----
 Filter
-├── filters: [is_true(CAST(t.number (#0) AS UInt64 NULL) = TRY_CAST(if(CAST(is_not_null(scalar_subquery_5 (#5)) AS Boolean NULL), CAST(CATCH(scalar_subquery_5 (#5)) AS Tuple(Int64 NULL, String NULL)), (0, NULL)) AS UInt64 NULL))]
+├── filters: [is_true(CAST(t.number (#0) AS UInt64 NULL) = TRY_CAST(if(CAST(is_not_null(scalar_subquery_5 (#5)) AS Boolean NULL), CAST(scalar_subquery_5 (#5) AS Int64 NULL), 0) AS UInt64 NULL))]
 ├── estimated rows: 0.33
 └── HashJoin
     ├── join type: SINGLE
@@ -337,7 +337,7 @@ query T
 explain select t.number from numbers(1) as t, numbers(1) as t1 where (select count(*) = 1 from numbers(1) where t.number = number) and t.number = t1.number
 ----
 Filter
-├── filters: [is_true(try_to_boolean(TRY_CAST(if(CAST(is_not_null(scalar_subquery_4 (#4)) AS Boolean NULL), CAST(CATCH(TRY_CAST(scalar_subquery_4 (#4) AS UInt64 NULL)) AS Tuple(Int64 NULL, String NULL)), (0, NULL)) AS UInt64 NULL)))]
+├── filters: [is_true(try_to_boolean(TRY_CAST(if(CAST(is_not_null(scalar_subquery_4 (#4)) AS Boolean NULL), CAST(TRY_CAST(scalar_subquery_4 (#4) AS UInt64 NULL) AS Int64 NULL), 0) AS UInt64 NULL)))]
 ├── estimated rows: 0.33
 └── HashJoin
     ├── join type: SINGLE