[SPARK-49000][SQL][FOLLOWUP] Improve code style and update comments #47565
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.
What changes were proposed in this pull request?
Fix
RewriteDistinctAggregatesrule to deal properly with aggregation on DISTINCT literals. Physical plan forselect count(distinct 1) from t:Problem is happening when
HashAggregate(keys=[], functions=[], output=[])node yields one row topartial_countnode, which then captures one row. This four-node structure is constructed byAggUtils.planAggregateWithOneDistinct.To fix the problem, we're adding
Expandnode which will force non-empty grouping expressions inHashAggregateExecnodes. This will in turn enable streaming zero rows to parentpartial_countnode, yielding correct final result.Why are the changes needed?
Aggregation with DISTINCT literal gives wrong results. For example, when running on empty table
t:select count(distinct 1) from treturns 1, while the correct result should be 0.For reference:
select count(1) from treturns 0, which is the correct and expected result.Does this PR introduce any user-facing change?
Yes, this fixes a critical bug in Spark.
How was this patch tested?
New e2e SQL tests for aggregates with DISTINCT literals.
Was this patch authored or co-authored using generative AI tooling?
No.