-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
[iteration #1] fix(substrait): Do not add implicit groupBy expressions when building logical plans from Substrait #14553
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
213 changes: 213 additions & 0 deletions
213
datafusion/substrait/tests/testdata/test_plans/multilayer_aggregate.substrait.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,213 @@ | ||
| { | ||
| "extensionUris": [{ | ||
| "extensionUriAnchor": 1, | ||
| "uri": "/functions_aggregate_generic.yaml" | ||
| }, { | ||
| "extensionUriAnchor": 2, | ||
| "uri": "/functions_arithmetic.yaml" | ||
| }, { | ||
| "extensionUriAnchor": 3, | ||
| "uri": "/functions_string.yaml" | ||
| }], | ||
| "extensions": [{ | ||
| "extensionFunction": { | ||
| "extensionUriReference": 1, | ||
| "functionAnchor": 0, | ||
| "name": "count:any" | ||
| } | ||
| }, { | ||
| "extensionFunction": { | ||
| "extensionUriReference": 2, | ||
| "functionAnchor": 1, | ||
| "name": "sum:i64" | ||
| } | ||
| }, { | ||
| "extensionFunction": { | ||
| "extensionUriReference": 3, | ||
| "functionAnchor": 2, | ||
| "name": "lower:str" | ||
| } | ||
| }], | ||
| "relations": [{ | ||
| "root": { | ||
| "input": { | ||
| "project": { | ||
| "common": { | ||
| "emit": { | ||
| "outputMapping": [2, 3] | ||
| } | ||
| }, | ||
| "input": { | ||
| "aggregate": { | ||
| "common": { | ||
| "direct": { | ||
| } | ||
| }, | ||
| "input": { | ||
| "aggregate": { | ||
| "common": { | ||
| "direct": { | ||
| } | ||
| }, | ||
| "input": { | ||
| "read": { | ||
| "common": { | ||
| "direct": {} | ||
| }, | ||
| "baseSchema": { | ||
| "names": [ | ||
| "product" | ||
| ], | ||
| "struct": { | ||
| "types": [ | ||
| { | ||
| "string": { | ||
| "nullability": "NULLABILITY_REQUIRED" | ||
| } | ||
| } | ||
| ], | ||
| "nullability": "NULLABILITY_REQUIRED" | ||
| } | ||
| }, | ||
| "namedTable": { | ||
| "names": [ | ||
| "sales" | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "groupings": [{ | ||
| "groupingExpressions": [{ | ||
| "selection": { | ||
| "directReference": { | ||
| "structField": { | ||
| "field": 0 | ||
| } | ||
| }, | ||
| "rootReference": { | ||
| } | ||
| } | ||
| }], | ||
| "expressionReferences": [] | ||
| }], | ||
| "measures": [{ | ||
| "measure": { | ||
| "functionReference": 0, | ||
| "args": [], | ||
| "sorts": [], | ||
| "phase": "AGGREGATION_PHASE_INITIAL_TO_RESULT", | ||
| "outputType": { | ||
| "i64": { | ||
| "typeVariationReference": 0, | ||
| "nullability": "NULLABILITY_REQUIRED" | ||
| } | ||
| }, | ||
| "invocation": "AGGREGATION_INVOCATION_ALL", | ||
| "arguments": [{ | ||
| "value": { | ||
| "selection": { | ||
| "directReference": { | ||
| "structField": { | ||
| "field": 0 | ||
| } | ||
| }, | ||
| "rootReference": { | ||
| } | ||
| } | ||
| } | ||
| }], | ||
| "options": [] | ||
| } | ||
| }], | ||
| "groupingExpressions": [] | ||
| } | ||
| }, | ||
| "groupings": [{ | ||
| "groupingExpressions": [{ | ||
| "selection": { | ||
| "directReference": { | ||
| "structField": { | ||
| "field": 0 | ||
| } | ||
| }, | ||
| "rootReference": { | ||
| } | ||
| } | ||
| }], | ||
| "expressionReferences": [] | ||
| }], | ||
| "measures": [{ | ||
| "measure": { | ||
| "functionReference": 1, | ||
| "args": [], | ||
| "sorts": [], | ||
| "phase": "AGGREGATION_PHASE_INITIAL_TO_RESULT", | ||
| "outputType": { | ||
| "i64": { | ||
| "typeVariationReference": 0, | ||
| "nullability": "NULLABILITY_NULLABLE" | ||
| } | ||
| }, | ||
| "invocation": "AGGREGATION_INVOCATION_ALL", | ||
| "arguments": [{ | ||
| "value": { | ||
| "selection": { | ||
| "directReference": { | ||
| "structField": { | ||
| "field": 1 | ||
| } | ||
| }, | ||
| "rootReference": { | ||
| } | ||
| } | ||
| } | ||
| }], | ||
| "options": [] | ||
| } | ||
| }], | ||
| "groupingExpressions": [] | ||
| } | ||
| }, | ||
| "expressions": [{ | ||
| "scalarFunction": { | ||
| "functionReference": 2, | ||
| "args": [], | ||
| "outputType": { | ||
| "string": { | ||
| "typeVariationReference": 0, | ||
| "nullability": "NULLABILITY_NULLABLE" | ||
| } | ||
| }, | ||
| "arguments": [{ | ||
| "value": { | ||
| "selection": { | ||
| "directReference": { | ||
| "structField": { | ||
| "field": 0 | ||
| } | ||
| }, | ||
| "rootReference": { | ||
| } | ||
| } | ||
| } | ||
| }], | ||
| "options": [] | ||
| } | ||
| }, { | ||
| "selection": { | ||
| "directReference": { | ||
| "structField": { | ||
| "field": 1 | ||
| } | ||
| }, | ||
| "rootReference": { | ||
| } | ||
| } | ||
| }] | ||
| } | ||
| }, | ||
| "names": ["lower(product)", "product_count"] | ||
| } | ||
| }], | ||
| "expectedTypeUrls": [] | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I agree adding
LogicalPlanBuilder::aggregate_without_implicit_group_by_exprsis not good (especially without documentation explaining the difference)What I suggest we do (perhaps as a different PR) is to add a flag to the builder to control this behavior
Then when that behavior is needed (in the sql planner) it could be enabled like
input .with_add_implicit_group_by_exprs(true) // new method to see the flag .aggregate(group_exprs, aggr_exprs)? .build()Is this something you would be willing to try @anlinc or @Blizzara ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm taking a look now!
It does indeed make sense to have this disabled by default, and enabled only on the SQL path.
I also want to experiment with @Blizzara's suggestion -- we could inline the additional expressions change on the SQL plan path instead. Part of why we may not want a variable is: