Skip to content

[SPARK-44040][SQL] Fix compute stats when AggregateExec node above QueryStageExec #41576

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-44040][SQL] Fix compute stats when AggregateExec node above QueryStageExec #41576

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
d0551db
Fix compute stats when AggregateExec nodes above QueryStageExec
wangyum Jun 13, 2023
91fceea
fix
wangyum Jun 14, 2023
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
11 changes: 9 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/LogicalQueryStage.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.expressions.{Attribute, SortOrder}
import org.apache.spark.sql.catalyst.plans.logical.{LeafNode, LogicalPlan, RepartitionOperation, Statistics}
import org.apache.spark.sql.catalyst.trees.TreePattern.{LOGICAL_QUERY_STAGE, REPARTITION_OPERATION, TreePattern}
import org.apache.spark.sql.execution.SparkPlan
import org.apache.spark.sql.execution.aggregate.BaseAggregateExec

/**
* The LogicalPlan wrapper for a [[QueryStageExec]], or a snippet of physical plan containing
Expand Down Expand Up @@ -53,8 +54,14 @@ case class LogicalQueryStage(
override def computeStats(): Statistics = {
// TODO this is not accurate when there is other physical nodes above QueryStageExec.
Copy link
Member

@dongjoon-hyun dongjoon-hyun Jun 14, 2023

Choose a reason for hiding this comment

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

According to the PR description, we have still issues for the other physical nodes?

Fix data issue. OptimizeOneRowPlan will use stats to remove Aggregate:

Copy link
Member Author

@wangyum wangyum Jun 14, 2023

Choose a reason for hiding this comment

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

I've checked other physical nodes and none of them seem to have this issue.

Copy link
Member

@dongjoon-hyun dongjoon-hyun Jun 14, 2023

Choose a reason for hiding this comment

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

Then, shall we remove this comment?

Copy link
Member Author

@wangyum wangyum Jun 14, 2023

Choose a reason for hiding this comment

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

I think keep it, new physical nodes may be added in the future.

Copy link
Contributor

@ulysses-you ulysses-you Jun 14, 2023

Choose a reason for hiding this comment

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

this comment should be still valid for aggregation with non-empty query stage as this pr only changes the empty case.

val physicalStats = physicalPlan.collectFirst {
case s: QueryStageExec => s
}.flatMap(_.computeStats())
case a: BaseAggregateExec if a.groupingExpressions.isEmpty =>
a.collectFirst {
case s: QueryStageExec => s.computeStats()
}.flatten.map { stat =>
if (stat.rowCount.contains(0)) stat.copy(rowCount = Some(1)) else stat
}
case s: QueryStageExec => s.computeStats()
}.flatten
if (physicalStats.isDefined) {
logDebug(s"Physical stats available as ${physicalStats.get} for plan: $physicalPlan")
} else {
Expand Down
8 changes: 8 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/adaptive/AdaptiveQueryExecSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2841,6 +2841,14 @@ class AdaptiveQueryExecSuite
}
}
}

test("SPARK-44040: Fix compute stats when AggregateExec nodes above QueryStageExec") {
val emptyDf = spark.range(1).where("false")
val aggDf1 = emptyDf.agg(sum("id").as("id")).withColumn("name", lit("df1"))
val aggDf2 = emptyDf.agg(sum("id").as("id")).withColumn("name", lit("df2"))
val unionDF = aggDf1.union(aggDf2)
checkAnswer(unionDF.select("id").distinct, Seq(Row(null)))
}
}

/**
Expand Down