AggregateExec: Take grouping sets into account for InputOrderMode #11301
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
|
I think clippy is failing on this PR due to #11302 |
alamb
approved these changes
Jul 6, 2024
There was a problem hiding this comment.
Makes senes to me. Thank you @thinkharderdev
I also double checked test coverage by running the new unit test without the changes in this PR and it indeed fails as expected
thread 'aggregates::tests::test_agg_exec_group_by_const' panicked at datafusion/physical-plan/src/aggregates/mod.rs:2360:9:
assertion `left == right` failed:
expected:
[
"+-----+-----+-------+----------+",
"| a | b | const | 1[count] |",
"+-----+-----+-------+----------+",
"| | | 1 | 32768 |",
"| | 0.0 | | 32768 |",
"| 0.0 | | | 32768 |",
"+-----+-----+-------+----------+",
]
actual:
[
"+-----+-----+-------+----------+",
"| a | b | const | 1[count] |",
"+-----+-----+-------+----------+",
"| | | 1 | 16384 |",
"| | | 1 | 16384 |",
"| | 0.0 | | 16384 |",
"| | 0.0 | | 8192 |",
"| | 0.0 | | 8192 |",
"| 0.0 | | | 16384 |",
"| 0.0 | | | 8192 |",
"| 0.0 | | | 8192 |",
"+-----+-----+-------+----------+",
]
| } else { | ||
| InputOrderMode::Linear | ||
| }; | ||
| let indices: Vec<usize> = indices |
There was a problem hiding this comment.
I recommend adding a comment here (perhaps copied from the description of the PR) explaining the subtelty involving grouping sets
| let aggregates: Vec<Arc<dyn AggregateExpr>> = vec![create_aggregate_expr( | ||
| count_udaf().as_ref(), | ||
| &[lit(1)], | ||
| &[Expr::Literal(ScalarValue::Int32(Some(1)))], |
There was a problem hiding this comment.
I think you could make this more concise like this (and ensure the type is correct)
Suggested change
| &[Expr::Literal(ScalarValue::Int32(Some(1)))], | |
| &[lit(1i32)], |
thinkharderdev
added a commit
to coralogix/arrow-datafusion
that referenced
this pull request
Jul 8, 2024
…ache#11301) * AggregateExec: Take grouping sets into account for InputOrderMode * pr comments
thinkharderdev
added a commit
to coralogix/arrow-datafusion
that referenced
this pull request
Jul 8, 2024
…ache#11301) * AggregateExec: Take grouping sets into account for InputOrderMode * pr comments # Conflicts: # datafusion/physical-plan/src/aggregates/mod.rs
findepi
pushed a commit
to findepi/datafusion
that referenced
this pull request
Jul 16, 2024
…ache#11301) * AggregateExec: Take grouping sets into account for InputOrderMode * pr comments
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 #11291
Rationale for this change
Fixes incorrect
InputOrderModewhen aggregation has grouping setsWhat changes are included in this PR?
When deriving indices for ordered preset, explicitly check all expanded grouping sets
Are these changes tested?
Yes
Are there any user-facing changes?
No
No