Skip to content

[SPARK-38489][SQL] Aggregate.groupOnly support foldable expressions #35795

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
wangyum wants to merge 2 commits into from
Closed

[SPARK-38489][SQL] Aggregate.groupOnly support foldable expressions #35795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcd5854
SPARK-38489: Aggregate.groupOnly support foldable expressions
wangyum Mar 10, 2022
eb2f241
Fix test error
wangyum Mar 10, 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/plans/logical/basicLogicalOperators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ case class Aggregate(
groupingExpressions.nonEmpty && aggregateExpressions.map {
case Alias(child, _) => child
case e => e
}.forall(a => groupingExpressions.exists(g => a.semanticEquals(g)))
}.forall(a => a.foldable || groupingExpressions.exists(g => a.semanticEquals(g)))
}
}

Expand Down
17 changes: 15 additions & 2 deletions ...alyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/AggregateOptimizeSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import org.apache.spark.sql.catalyst.analysis.AnalysisTest
import org.apache.spark.sql.catalyst.dsl.expressions._
import org.apache.spark.sql.catalyst.dsl.plans._
import org.apache.spark.sql.catalyst.expressions.Literal
import org.apache.spark.sql.catalyst.expressions.Literal.{FalseLiteral, TrueLiteral}
import org.apache.spark.sql.catalyst.plans.{LeftOuter, RightOuter}
import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, Distinct, LocalRelation, LogicalPlan}
import org.apache.spark.sql.catalyst.rules.RuleExecutor
Expand Down Expand Up @@ -122,8 +123,7 @@ class AggregateOptimizeSuite extends AnalysisTest {
Optimize.execute(
x.join(y, LeftOuter, Some("x.a".attr === "y.a".attr))
.groupBy("x.a".attr)("x.a".attr, Literal(1)).analyze),
x.join(y, LeftOuter, Some("x.a".attr === "y.a".attr))
.groupBy("x.a".attr)("x.a".attr, Literal(1)).analyze)
x.groupBy("x.a".attr)("x.a".attr, Literal(1)).analyze)
}

test("SPARK-37292: Removes outer join if it only has DISTINCT on streamed side with alias") {
Expand All @@ -148,4 +148,17 @@ class AggregateOptimizeSuite extends AnalysisTest {
x.select("x.b".attr.as("newAlias1"), "x.b".attr.as("newAlias2"))
.groupBy("newAlias1".attr, "newAlias2".attr)("newAlias1".attr, "newAlias2".attr).analyze)
}

test("SPARK-38489: Aggregate.groupOnly support foldable expressions") {
val x = testRelation.subquery('x)
val y = testRelation.subquery('y)
comparePlans(
Optimize.execute(
Distinct(x.join(y, LeftOuter, Some("x.a".attr === "y.a".attr))
.select("x.b".attr, TrueLiteral, FalseLiteral.as("newAlias")))
.analyze),
x.select("x.b".attr, TrueLiteral, FalseLiteral.as("newAlias"))
.groupBy("x.b".attr)("x.b".attr, TrueLiteral, FalseLiteral.as("newAlias"))
.analyze)
}
}