[SPARK-57775][SQL] Return one row for GROUP BY GROUPING SETS (()) over empty input#56891
Open
uros-db wants to merge 2 commits into
Open
[SPARK-57775][SQL] Return one row for GROUP BY GROUPING SETS (()) over empty input#56891uros-db wants to merge 2 commits into
uros-db wants to merge 2 commits into
Conversation
`GROUP BY GROUPING SETS (())` is a grand total, semantically identical to an aggregation with no `GROUP BY` clause. It was lowered to a grouped `Aggregate` over an `Expand` (grouping by `spark_grouping_id`), so over empty input it returned zero rows instead of one. The same defect affected the equivalent empty `GROUP BY CUBE()` and `GROUP BY ROLLUP()`, which also lower to a single empty grouping set. This lowers the single-empty-grouping-set case to a global `Aggregate` (no grouping expressions, no `Expand`) in `GroupingAnalyticsTransformer`, so it returns one (grand total) row over empty input, matching the `GROUP BY`-less form and the SQL standard. `grouping_id()` folds to the constant `0`, and `grouping()`/`grouping_id()` in `HAVING`/`ORDER BY` resolve against that constant. The fix lands in both the legacy fixed-point analyzer and the single-pass resolver, which share `GroupingAnalyticsTransformer`. The behavior is gated by an internal SQL config, `spark.sql.analyzer.lowerEmptyGroupingSetToGlobalAggregate.enabled` (default true). When set to false, lowering reverts to the legacy `Expand`-based form (zero rows over empty input). The flag gates all three decision points (the transformer lowering and the `grouping_id()` resolution in each analyzer) so the off state reproduces pre-fix behavior identically in both analyzers. Tested via golden cases in `grouping_set.sql` (empty-input grand total, `grouping_id()` in SELECT/HAVING/ORDER BY, `grouping()` rejection, non-empty input), flag-off coverage in `grouping_set_grand_total_disabled.sql`, the regenerated `group-analytics` golden file, and `ResolveGroupingAnalyticsSuite`. Co-authored-by: Isaac
15651e4 to
045f843
Compare
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
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?
Lower the single-empty-grouping-set case to a global
Aggregate(no grouping expressions, noExpand) inGroupingAnalyticsTransformer, so it returns one (grand total) row over empty input, matching theGROUP BY-less form and the SQL standard.grouping_id()folds to the constant0, andgrouping()/grouping_id()inHAVING/ORDER BYresolve against that constant. The fix lands in both the legacy fixed-point analyzer and the single-pass resolver, which shareGroupingAnalyticsTransformer.Why are the changes needed?
GROUP BY GROUPING SETS (())is a grand total, semantically identical to an aggregation with noGROUP BYclause. It was lowered to a groupedAggregateover anExpand(grouping byspark_grouping_id), so over empty input it returned zero rows instead of one. The same defect affected the equivalent emptyGROUP BY CUBE()andGROUP BY ROLLUP(), which also lower to a single empty grouping set.Does this PR introduce any user-facing change?
Yes, the new (correct) behavior is gated by an internal SQL config,
spark.sql.analyzer.lowerEmptyGroupingSetToGlobalAggregate.enabled(default true). When set to false, lowering reverts to the legacyExpand-based form (zero rows over empty input). The flag gates all three decision points (the transformer lowering and thegrouping_id()resolution in each analyzer) so the off state reproduces pre-fix behavior identically in both analyzers.How was this patch tested?
Tested via golden cases in
grouping_set.sql(empty-input grand total,grouping_id()in SELECT/HAVING/ORDER BY,grouping()rejection, non-empty input), flag-off coverage ingrouping_set_grand_total_disabled.sql, the regeneratedgroup-analyticsgolden file, andResolveGroupingAnalyticsSuite.Was this patch authored or co-authored using generative AI tooling?
Generated-by: Opus 4.8