Add ROLLUP and GROUPING SETS substrait support #7382
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alamb
changed the title
waynexia
approved these changes
Aug 24, 2023
| async fn aggregate_grouping_rollup() -> Result<()> { | ||
| assert_expected_plan( | ||
| "SELECT a, c, e, avg(b) FROM data GROUP BY ROLLUP (a, c, e)", | ||
| "Aggregate: groupBy=[[GROUPING SETS ((data.a, data.c, data.e), (data.a, data.c), (data.a), ())]], aggr=[[AVG(data.b)]]\ |
Comment on lines
535
to
537
| for i in 0..set.len() { | ||
| sets.push(set[..=i].to_vec()); | ||
| } |
There was a problem hiding this comment.
This looks great. It generates the same result (after .rev()) with create_rollup_physical_expr
|
I merged this branch up from `main to resolve a conflict. I hope to merge it when CI completes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Closes #7381 .
Rationale for this change
To add support for aggregation with
ROLLUPandGROUPING SETS.What changes are included in this PR?
Expr::GroupingSettosubstrait::proto::aggregate_rel::GroupingRollupgets expanded into equivalent grouping sets, since Substrait doesn't have a dedicated type forROLLUPCubeis not yet supportedsubstrait::proto::aggregate_rel::GroupingtoExpr::GroupingSetAre these changes tested?
Yes.
Are there any user-facing changes?
No.
No.