Preserve grouping ID during aggregate CSE - #24144
Merged
gabotechs merged 2 commits intoAug 7, 2026
Merged
Conversation
gabotechs
reviewed
Aug 6, 2026
Comment on lines
+1112
to
+1113
| #[test] | ||
| fn common_aggregate_grouping_set_preserves_internal_id() -> Result<()> { |
Contributor
There was a problem hiding this comment.
Is there a chance we can reproduce this with a SLT?
Contributor
There was a problem hiding this comment.
I poked around at doing this but I couldn't see an easy way to do it.
Member
Author
There was a problem hiding this comment.
Same, tried a bunch of ways.
neilconway
approved these changes
Aug 6, 2026
neilconway
left a comment
Contributor
There was a problem hiding this comment.
lgtm! Clean fix with a nicely scoped unit test.
There's a few places where we construct the grouping ID column via Expr::Column(Column::from_name(Aggregate::INTERNAL_GROUPING_ID)), which maybe would benefit from centralizing into a helper, but I think it's marginal.
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #24144 +/- ##
==========================================
- Coverage 81.05% 81.05% -0.01%
==========================================
Files 1106 1106
Lines 380556 380582 +26
Branches 380556 380582 +26
==========================================
+ Hits 308477 308492 +15
- Misses 53861 53866 +5
- Partials 18218 18224 +6 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Member
Author
@neilconway I can follow up with a new issue and a new PR, I think it would definitely help a bit. |
Contributor
Sure, that would be great! Feel free to at-me on it. |
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Aug 6, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Aug 6, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Aug 6, 2026
…gregate-cse-wnmpwslywnzn
gabotechs
enabled auto-merge
August 6, 2026 16:40
gabotechs
disabled auto-merge
August 7, 2026 07:05
gabotechs
enabled auto-merge
August 7, 2026 07:05
notfilippo
deleted the
filippo.rossi/preserve-grouping-id-during-aggregate-cse-wnmpwslywnzn
branch
August 7, 2026 08:07
notfilippo
added a commit
to DataDog/datafusion
that referenced
this pull request
Aug 7, 2026
## Which issue does this PR close? <!-- We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123. --> - Closes apache#24143. ## Rationale for this change <!-- Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed. Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes. Please explain the problem you are trying to solve in terms of the user-visible behavior, rather than the implementation. For example, "The code in `foo.rs` doesn't handle nulls" is a symptom of the implementation. "COUNT(DISTINCT) returns wrong results when the column contains nulls" is the user-visible problem. --> See apache#24143. ## What changes are included in this PR? <!-- There is no need to duplicate the description in the issue here, but it is sometimes worth providing a summary of the individual changes in this PR. --> - Preserve `__grouping_id` in CSE recovery projections for grouping-set aggregates. - Add regression coverage. ## Are these changes tested? <!-- We typically require tests for all PRs in order to: 1. Prevent the code from being accidentally broken by subsequent changes 2. Serve as another way to document the expected behavior of the code If tests are not included in your PR, please explain why (for example, are they covered by existing tests)? --> Yes. ## Are there any user-facing changes? <!-- If there are user-facing changes then we may require documentation to be updated before approving the PR. If there are any breaking changes to public APIs, please add the `api change` label. --> No. Co-authored-by: Gabriel <45515538+gabotechs@users.noreply.github.com> (cherry picked from commit e64e3f7)
notfilippo
added a commit
to DataDog/datafusion
that referenced
this pull request
Aug 7, 2026
## Which issue does this PR close? <!-- We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123. --> - Closes apache#24143. ## Rationale for this change <!-- Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed. Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes. Please explain the problem you are trying to solve in terms of the user-visible behavior, rather than the implementation. For example, "The code in `foo.rs` doesn't handle nulls" is a symptom of the implementation. "COUNT(DISTINCT) returns wrong results when the column contains nulls" is the user-visible problem. --> See apache#24143. ## What changes are included in this PR? <!-- There is no need to duplicate the description in the issue here, but it is sometimes worth providing a summary of the individual changes in this PR. --> - Preserve `__grouping_id` in CSE recovery projections for grouping-set aggregates. - Add regression coverage. ## Are these changes tested? <!-- We typically require tests for all PRs in order to: 1. Prevent the code from being accidentally broken by subsequent changes 2. Serve as another way to document the expected behavior of the code If tests are not included in your PR, please explain why (for example, are they covered by existing tests)? --> Yes. ## Are there any user-facing changes? <!-- If there are user-facing changes then we may require documentation to be updated before approving the PR. If there are any breaking changes to public APIs, please add the `api change` label. --> No. Co-authored-by: Gabriel <45515538+gabotechs@users.noreply.github.com> (cherry picked from commit e64e3f7)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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?
Rationale for this change
See #24143.
What changes are included in this PR?
__grouping_idin CSE recovery projections for grouping-set aggregates.Are these changes tested?
Yes.
Are there any user-facing changes?
No.