Skip to content

[SPARK-34031][SQL] Union operator missing rowCount when CBO enabled #31068

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 3 commits into from
Closed

[SPARK-34031][SQL] Union operator missing rowCount when CBO enabled #31068

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0dbbe4
Union operator missing rowCount
wangyum Jan 6, 2021
3c5af90
Fix
wangyum Jan 7, 2021
7521f42
Fix a nit and retrigger GA build
HyukjinKwon Jan 7, 2021
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 @@ -217,7 +217,7 @@ object Union {
}

/**
* Logical plan for unioning two plans, without a distinct. This is UNION ALL in SQL.
* Logical plan for unioning multiple plans, without a distinct. This is UNION ALL in SQL.
*
* @param byName Whether resolves columns in the children by column names.
* @param allowMissingCol Allows missing columns in children query plans. If it is true,
Expand Down
10 changes: 9 additions & 1 deletion ...a/org/apache/spark/sql/catalyst/plans/logical/statsEstimation/BasicStatsPlanVisitor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,15 @@ object BasicStatsPlanVisitor extends LogicalPlanVisitor[Statistics] {

override def visitScriptTransform(p: ScriptTransformation): Statistics = default(p)

override def visitUnion(p: Union): Statistics = fallback(p)
override def visitUnion(p: Union): Statistics = {
val stats = p.children.map(_.stats)
val rowCount = if (stats.exists(_.rowCount.isEmpty)) {
None
} else {
Some(stats.map(_.rowCount.get).sum)
}
Statistics(sizeInBytes = stats.map(_.sizeInBytes).sum, rowCount = rowCount)
}
Comment on lines +82 to +90

@wangyum wangyum Jan 6, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Same logic, just add row count:

spark/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/statsEstimation/SizeInBytesOnlyStatsPlanVisitor.scala

Lines 148 to 150 in 6c5ba81

override def visitUnion(p: Union): Statistics = {
Statistics(sizeInBytes = p.children.map(_.stats.sizeInBytes).sum)
}


override def visitWindow(p: Window): Statistics = fallback(p)

Expand Down
10 changes: 10 additions & 0 deletions .../test/scala/org/apache/spark/sql/catalyst/statsEstimation/BasicStatsEstimationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,16 @@ class BasicStatsEstimationSuite extends PlanTest with StatsEstimationTestBase {
expectedStatsCboOff = Statistics(sizeInBytes = 120))
}

test("SPARK-34031: Union operator missing rowCount when enable CBO") {
val union = Union(plan :: plan :: plan :: Nil)
val childrenSize = union.children.size
val sizeInBytes = plan.size.get * childrenSize
val rowCount = Some(plan.rowCount * childrenSize)
checkStats(union,
expectedStatsCboOn = Statistics(sizeInBytes = sizeInBytes, rowCount = rowCount),
expectedStatsCboOff = Statistics(sizeInBytes = sizeInBytes))
}

/** Check estimated stats when cbo is turned on/off. */
private def checkStats(
plan: LogicalPlan,
Expand Down