[SPARK-17616][SQL] Support a single distinct aggregate combined with a non-partial aggregate #15187
Conversation
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
…gregate combined with a non-partial aggregate.
Contributor
Author
|
cc @JoshRosen @rxin |
|
Test build #65737 has finished for PR 15187 at commit
|
srinathshankar
suggested changes
Sep 22, 2016
| checkRewrite(RewriteDistinctAggregates(input)) | ||
| } | ||
|
|
||
| test("multiple distinct groups without non-distinct aggregates") { |
Contributor
There was a problem hiding this comment.
Do you mean non-partial aggregates here ?
Contributor
Author
There was a problem hiding this comment.
I actually mean that the test only contains distinct aggregates.
| .analyze | ||
| val rewrite = RewriteDistinctAggregates(input) | ||
| comparePlans(input, rewrite) | ||
| } |
Contributor
There was a problem hiding this comment.
Could you also add single distinct group with aggregates that have partial
| val input = testRelation | ||
| .groupBy('a)(countDistinct('b, 'c), countDistinct('d), sum('e)) | ||
| .analyze | ||
| checkRewrite(RewriteDistinctAggregates(input)) |
Contributor
There was a problem hiding this comment.
Could you also add a test with partials, and one without partials here ? (part of the same test(""))
|
Test build #65784 has finished for PR 15187 at commit
|
Contributor
Author
|
Merging to master/2.0. Thanks for the review. |
asfgit
pushed a commit
that referenced
this pull request
Sep 22, 2016
…a non-partial aggregate
We currently cannot execute an aggregate that contains a single distinct aggregate function and an one or more non-partially plannable aggregate functions, for example:
```sql
select grp,
collect_list(col1),
count(distinct col2)
from tbl_a
group by 1
```
This is a regression from Spark 1.6. This is caused by the fact that the single distinct aggregation code path assumes that all aggregates can be planned in two phases (is partially aggregatable). This PR works around this issue by triggering the `RewriteDistinctAggregates` in such cases (this is similar to the approach taken in 1.6).
Created `RewriteDistinctAggregatesSuite` which checks if the aggregates with distinct aggregate functions get rewritten into two `Aggregates` and an `Expand`. Added a regression test to `DataFrameAggregateSuite`.
Author: Herman van Hovell <[email protected]>
Closes #15187 from hvanhovell/SPARK-17616.
(cherry picked from commit 0d63487)
Signed-off-by: Herman van Hovell <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
What changes were proposed in this pull request?
We currently cannot execute an aggregate that contains a single distinct aggregate function and an one or more non-partially plannable aggregate functions, for example:
This is a regression from Spark 1.6. This is caused by the fact that the single distinct aggregation code path assumes that all aggregates can be planned in two phases (is partially aggregatable). This PR works around this issue by triggering the
RewriteDistinctAggregatesin such cases (this is similar to the approach taken in 1.6).How was this patch tested?
Created
RewriteDistinctAggregatesSuitewhich checks if the aggregates with distinct aggregate functions get rewritten into twoAggregatesand anExpand. Added a regression test toDataFrameAggregateSuite.