haohuaijin commented on code in PR #8266:
URL: https://github.com/apache/arrow-datafusion/pull/8266#discussion_r1402915423
##########
datafusion/optimizer/src/single_distinct_to_groupby.rs:
##########
@@ -478,4 +520,52 @@ mod tests {
assert_optimized_plan_equal(&plan, expected)
}
+
+ #[test]
+ fn two_distinct_and_one_common() -> Result<()> {
+ let table_scan = test_table_scan()?;
+
+ let plan = LogicalPlanBuilder::from(table_scan)
+ .aggregate(
+ vec![col("a")],
+ vec![
+ sum(col("c")),
+ count_distinct(col("b")),
+ Expr::AggregateFunction(expr::AggregateFunction::new(
+ AggregateFunction::Max,
+ vec![col("b")],
+ true,
+ None,
+ None,
+ )),
+ ],
+ )?
+ .build()?;
+ // Should work
+ let expected = "Projection: test.a, SUM(alias2) AS SUM(test.c),
COUNT(alias1) AS COUNT(DISTINCT test.b), MAX(alias1) AS MAX(DISTINCT test.b)
[a:UInt32, SUM(test.c):UInt64;N, COUNT(DISTINCT test.b):Int64;N, MAX(DISTINCT
test.b):UInt32;N]\
+ \n Aggregate: groupBy=[[test.a]],
aggr=[[SUM(alias2), COUNT(alias1), MAX(alias1)]] [a:UInt32,
SUM(alias2):UInt64;N, COUNT(alias1):Int64;N, MAX(alias1):UInt32;N]\
+ \n Aggregate: groupBy=[[test.a, test.b AS
alias1]], aggr=[[SUM(test.c) AS alias2]] [a:UInt32, alias1:UInt32,
alias2:UInt64;N]\
+ \n TableScan: test [a:UInt32, b:UInt32,
c:UInt32]";
+
+ assert_optimized_plan_equal(&plan, expected)
+ }
+
+ #[test]
Review Comment:
Done,
the test for `COUNT(A), COUNT(DISTINCT b)` already have.
also add negative testes for `order_by`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
