Skip to content

[SPARK-41035][SQL] Don't patch foldable children of aggregate functions in RewriteDistinctAggregates #38565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[SPARK-41035][SQL] Don't patch foldable children of aggregate functions in RewriteDistinctAggregates #38565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d945e31
try to fix
bersprockets Oct 13, 2022
581983e
Update
bersprockets Nov 8, 2022
9d4008d
Update
bersprockets Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...st/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteDistinctAggregates.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ object RewriteDistinctAggregates extends Rule[LogicalPlan] {
}.unzip3

// Setup expand & aggregate operators for distinct aggregate expressions.
val distinctAggChildAttrLookup = distinctAggChildAttrMap.toMap
val distinctAggChildAttrLookup = distinctAggChildAttrMap.filter(!_._1.foldable).toMap
val distinctAggFilterAttrLookup = Utils.toMap(distinctAggFilters, maxConds.map(_.toAttribute))
val distinctAggOperatorMap = distinctAggGroups.toSeq.zipWithIndex.map {
case ((group, expressions), i) =>
Expand Down
10 changes: 10 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1527,6 +1527,16 @@ class DataFrameAggregateSuite extends QueryTest
|""".stripMargin)
checkAnswer(res3, Row(1, 7, 4.5, 1) :: Row(2, 7, 4.5, 2) :: Nil)
}

test("SPARK-41035: Reuse of literal in distinct aggregations should work") {
val res = sql(
"""select a, count(distinct 100), count(distinct b, 100)
|from values (1, 2), (4, 5), (4, 6) as data(a, b)
|group by a;
|""".stripMargin
)
checkAnswer(res, Row(1, 1, 1) :: Row(4, 1, 2) :: Nil)
}
}

case class B(c: Option[Double])
Expand Down