Skip to content

[DF] Fix remaining regressions in optimizer rule #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ayushdg merged 8 commits into from
Sep 21, 2022
Merged

[DF] Fix remaining regressions in optimizer rule #784

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2982803
Revert to earlier version of rule and skip failing tests
andygrove Sep 21, 2022
3171e73
add Rust workflow
andygrove Sep 21, 2022
8a5810c
ci
andygrove Sep 21, 2022
0088970
ci
andygrove Sep 21, 2022
e32ba14
fix remaining regressions in optimizer rule
andygrove Sep 21, 2022
5eb5860
fmt
andygrove Sep 21, 2022
b289bc4
Merge remote-tracking branch 'upstream/datafusion-sql-planner' into d…
andygrove Sep 21, 2022
8027c7e
unignore tests
andygrove Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions dask_planner/src/sql/optimizer/eliminate_agg_distinct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,30 +503,28 @@ mod tests {
.expect("building plan")
}

#[ignore]
#[test]
fn test_single_distinct_group_by() -> Result<()> {
let plan = LogicalPlanBuilder::from(test_table_scan("a"))
.aggregate(vec![col("a")], vec![count_distinct(col("b"))])?
.build()?;

let expected = "Projection: #a.a, #COUNT(a.a) AS COUNT(DISTINCT a.b)\
\n Aggregate: groupBy=[[#a.a]], aggr=[[COUNT(#a.a)]]\
let expected = "Projection: #a.a, #COUNT(a.b) AS COUNT(DISTINCT a.b)\
\n Aggregate: groupBy=[[#a.a]], aggr=[[COUNT(#a.b)]]\
\n Aggregate: groupBy=[[#a.a, #a.b]], aggr=[[]]\
\n TableScan: a";
assert_optimized_plan_eq(&plan, expected);
Ok(())
}

#[ignore]
#[test]
fn test_single_distinct_group_by_with_alias() -> Result<()> {
let plan = LogicalPlanBuilder::from(test_table_scan("a"))
.aggregate(vec![col("a")], vec![count_distinct(col("b")).alias("cd_b")])?
.build()?;

let expected = "Projection: #a.a, #COUNT(a.a) AS cd_b\
\n Aggregate: groupBy=[[#a.a]], aggr=[[COUNT(#a.a)]]\
let expected = "Projection: #a.a, #COUNT(a.b) AS cd_b\
\n Aggregate: groupBy=[[#a.a]], aggr=[[COUNT(#a.b)]]\
\n Aggregate: groupBy=[[#a.a, #a.b]], aggr=[[]]\
\n TableScan: a";
assert_optimized_plan_eq(&plan, expected);
Expand Down