Skip to content
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

Jump to bottom

[SPARK-34079][SQL][FOLLOWUP] Improve the readability and simplify the code for MergeScalarSubqueries #38461

Closed
wants to merge 5 commits into from
Closed

[SPARK-34079][SQL][FOLLOWUP] Improve the readability and simplify the code for MergeScalarSubqueries #38461

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57744bf
[SPARK-34079][SQL] Improve the readability and simplify the code for …
beliefer Nov 1, 2022
ae2e096
Update code
beliefer Nov 1, 2022
8a37caa
Update code
beliefer Nov 2, 2022
e327023
Update code
beliefer Nov 2, 2022
e9d4042
Update code
beliefer Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 18 additions & 19 deletions ...talyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/MergeScalarSubqueries.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,25 +346,20 @@ object MergeScalarSubqueries extends Rule[LogicalPlan] {
// Only allow aggregates of the same implementation because merging different implementations
// could cause performance regression.
private def supportedAggregateMerge(newPlan: Aggregate, cachedPlan: Aggregate) = {
val newPlanAggregateExpressions = newPlan.aggregateExpressions.flatMap(_.collect {
case a: AggregateExpression => a
})
val cachedPlanAggregateExpressions = cachedPlan.aggregateExpressions.flatMap(_.collect {
case a: AggregateExpression => a
})
val newPlanSupportsHashAggregate = Aggregate.supportsHashAggregate(
newPlanAggregateExpressions.flatMap(_.aggregateFunction.aggBufferAttributes))
val cachedPlanSupportsHashAggregate = Aggregate.supportsHashAggregate(
cachedPlanAggregateExpressions.flatMap(_.aggregateFunction.aggBufferAttributes))
val aggregateExpressionsSeq =
Seq(newPlan, cachedPlan).map(plan => plan.aggregateExpressions.flatMap(_.collect {
case a: AggregateExpression => a
}))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
val aggregateExpressionsSeq =
Seq(newPlan, cachedPlan).map(plan => plan.aggregateExpressions.flatMap(_.collect {
case a: AggregateExpression => a
}))
val aggregateExpressionsSeq = Seq(newPlan, cachedPlan).map { plan =>
plan.aggregateExpressions.flatMap(_.collect {
case a: AggregateExpression => a
})
}

val Seq(newPlanSupportsHashAggregate, cachedPlanSupportsHashAggregate) =
aggregateExpressionsSeq.map(aggregateExpressions => Aggregate.supportsHashAggregate(
aggregateExpressions.flatMap(_.aggregateFunction.aggBufferAttributes)))
lazy val Seq(newPlanSupportsObjectHashAggregate, cachedPlanSupportsObjectHashAggregate) =
aggregateExpressionsSeq.map(aggregateExpressions =>
Aggregate.supportsObjectHashAggregate(aggregateExpressions))
newPlanSupportsHashAggregate && cachedPlanSupportsHashAggregate ||
newPlanSupportsHashAggregate == cachedPlanSupportsHashAggregate && {
val newPlanSupportsObjectHashAggregate =
Aggregate.supportsObjectHashAggregate(newPlanAggregateExpressions)
val cachedPlanSupportsObjectHashAggregate =
Aggregate.supportsObjectHashAggregate(cachedPlanAggregateExpressions)
newPlanSupportsObjectHashAggregate && cachedPlanSupportsObjectHashAggregate ||
newPlanSupportsObjectHashAggregate == cachedPlanSupportsObjectHashAggregate
}
newPlanSupportsHashAggregate == cachedPlanSupportsHashAggregate &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can avoid using lazy val

newPlanSupportsHashAggregate == cachedPlanSupportsHashAggregate && {
  val Seq(newPlanSupportsObjectHashAggregate, cachedPlanSupportsObjectHashAggregate) = ...
  ...
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got it.

(newPlanSupportsObjectHashAggregate && cachedPlanSupportsObjectHashAggregate ||
newPlanSupportsObjectHashAggregate == cachedPlanSupportsObjectHashAggregate)
}

// Second traversal replaces `ScalarSubqueryReference`s to either
Expand Down Expand Up @@ -394,7 +389,11 @@ object MergeScalarSubqueries extends Rule[LogicalPlan] {
}

/**
* Temporal reference to a subquery.
* Temporal reference to a cached subquery.
*
* @param subqueryIndex A subquery index in the cache.
* @param headerIndex A index in the output of merged subquery.
* @param dataType The dataType of origin scalar subquery.
*/
case class ScalarSubqueryReference(
subqueryIndex: Int,
Expand Down