Apache DataFusion SQL Query Engine
fix: eliminate group by constant empty input (#22132)
H9ab20683ecd2
diff --git a/datafusion/optimizer/src/eliminate_group_by_constant.rs b/datafusion/optimizer/src/eliminate_group_by_constant.rsindex e21241ba7d..f0efe96668 100644--- a/datafusion/optimizer/src/eliminate_group_by_constant.rs+++ b/datafusion/optimizer/src/eliminate_group_by_constant.rs@@ -64,10 +64,14 @@ impl OptimizerRule for EliminateGroupByConstant {.group_expr.iter().partition(|expr| is_redundant_group_expr(expr, &group_by_columns));-- if redundant.is_empty()- || (required.is_empty() && aggregate.aggr_expr.is_empty())- {+ // Return now if no simplification can be done. We also bail out+ // if applying the optimization would eliminate all of the+ // grouping expressions (e.g., GROUP BY on only constant+ // expressions): this would turn a grouped aggregate into an+ // ungrouped aggregate, which changes query semantics (grouped+ // aggregates produce an empty result set on an empty input,+ // whereas ungrouped aggregates return a single row).+ if redundant.is_empty() || required.is_empty() {return Ok(Transformed::no(LogicalPlan::Aggregate(aggregate)));}@@ -221,16 +225,15 @@ mod tests {}#[test]- fn test_eliminate_constant() -> Result<()> {+ fn test_no_op_only_constant_with_aggregate() -> Result<()> {let scan = test_table_scan()?;let plan = LogicalPlanBuilder::from(scan).aggregate(vec![lit("test"), lit(123u32)], vec![count(col("c"))])?.build()?;assert_optimized_plan_equal!(plan, @r#"- Projection: Utf8("test"), UInt32(123), count(test.c)- Aggregate: groupBy=[[]], aggr=[[count(test.c)]]- TableScan: test+ Aggregate: groupBy=[[Utf8("test"), UInt32(123)]], aggr=[[count(test.c)]]+ TableScan: test"#)}diff --git a/datafusion/sqllogictest/test_files/aggregate.slt b/datafusion/sqllogictest/test_files/aggregate.sltindex 8e7a9639f5..36677092ae 100644--- a/datafusion/sqllogictest/test_files/aggregate.slt+++ b/datafusion/sqllogictest/test_files/aggregate.slt@@ -8047,6 +8047,23 @@ CREATE TABLE t1(v1 int);statement error DataFusion error: Error during planning: Aggregate functions are not allowed in the WHERE clause. Consider using HAVING insteadSELECT v1 FROM t1 WHERE ((count(v1) % 1) << 1) > 0;+# issue: https://github.com/apache/datafusion/issues/11748+query R+SELECT AVG(v1) FROM t1 GROUP BY false HAVING false;+----++query R+SELECT AVG(v1) FROM t1 GROUP BY false;+----++statement ok+INSERT INTO t1 VALUES (1), (2), (3);++query R+SELECT AVG(v1) FROM t1 GROUP BY false;+----+2+statement okDROP TABLE t1;diff --git a/datafusion/sqllogictest/test_files/optimizer_group_by_constant.slt b/datafusion/sqllogictest/test_files/optimizer_group_by_constant.sltindex da1e7de22b..9df5551241 100644--- a/datafusion/sqllogictest/test_files/optimizer_group_by_constant.slt+++ b/datafusion/sqllogictest/test_files/optimizer_group_by_constant.slt@@ -60,10 +60,9 @@ FROM test_table tgroup by 1, 2, 3----logical_plan-01)Projection: Int64(123), Int64(456), Int64(789), count(Int64(1)), avg(t.c12)-02)--Aggregate: groupBy=[[]], aggr=[[count(Int64(1)), avg(t.c12)]]-03)----SubqueryAlias: t-04)------TableScan: test_table projection=[c12]+01)Aggregate: groupBy=[[Int64(123), Int64(456), Int64(789)]], aggr=[[count(Int64(1)), avg(t.c12)]]+02)--SubqueryAlias: t+03)----TableScan: test_table projection=[c12]query TTEXPLAIN@@ -72,8 +71,8 @@ FROM test_table tGROUP BY 1, 2----logical_plan-01)Projection: Date32("2023-05-04") AS dt, Boolean(true) AS today_filter, count(Int64(1))-02)--Aggregate: groupBy=[[]], aggr=[[count(Int64(1))]]+01)Projection: to_date(Utf8("2023-05-04")) AS dt, date_part(Utf8("DAY"),now()) < Int64(1000) AS today_filter, count(Int64(1))+02)--Aggregate: groupBy=[[Date32("2023-05-04") AS to_date(Utf8("2023-05-04")), Boolean(true) AS date_part(Utf8("DAY"),now()) < Int64(1000)]], aggr=[[count(Int64(1))]]03)----SubqueryAlias: t04)------TableScan: test_table projection=[]@@ -90,10 +89,9 @@ FROM test_table tGROUP BY 1----logical_plan-01)Projection: Boolean(true) AS NOT date_part(Utf8("MONTH"),now()) BETWEEN Int64(50) AND Int64(60), count(Int64(1))-02)--Aggregate: groupBy=[[]], aggr=[[count(Int64(1))]]-03)----SubqueryAlias: t-04)------TableScan: test_table projection=[]+01)Aggregate: groupBy=[[Boolean(true) AS NOT date_part(Utf8("MONTH"),now()) BETWEEN Int64(50) AND Int64(60)]], aggr=[[count(Int64(1))]]+02)--SubqueryAlias: t+03)----TableScan: test_table projection=[]query TTEXPLAIN@@ -119,7 +117,7 @@ logical_plan# Config reset-# The SLT runner sets `target_partitions` to 4 instead of using the default, so+# The SLT runner sets `target_partitions` to 4 instead of using the default, so# reset it explicitly.statement okset datafusion.execution.target_partitions = 4;