Skip to content

[SPARK-43199][SQL] Make InlineCTE idempotent #40856

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
peter-toth wants to merge 5 commits into from
Closed

[SPARK-43199][SQL] Make InlineCTE idempotent #40856

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7dce656
[SPARK-43199][SQL] Make InlineCTE idempotent
peter-toth Apr 19, 2023
8765bf7
improved version that stores the outgoing references and counts to ot…
peter-toth Apr 20, 2023
fccda08
use outerCTEId instead of outerRefMap
peter-toth Apr 20, 2023
ecbc4b8
add scaladoc, rename param
peter-toth Apr 21, 2023
806c2de
fix
peter-toth Apr 21, 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
Prev Previous commit
Next Next commit
use outerCTEId instead of outerRefMap
  • Loading branch information
@peter-toth
peter-toth committed Apr 20, 2023
commit fccda08a3f605169282f42e1f147aad91f4adf0c
16 changes: 9 additions & 7 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/InlineCTE.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,33 +72,35 @@ case class InlineCTE(alwaysInline: Boolean = false) extends Rule[LogicalPlan] {
def buildCTEMap(
plan: LogicalPlan,
cteMap: mutable.Map[Long, (CTERelationDef, Int, mutable.Map[Long, Int])],
outerRefMap: Option[mutable.Map[Long, Int]] = None): Unit = {
outerCTEId: Option[Long] = None): Unit = {
plan match {
case WithCTE(child, cteDefs) =>
cteDefs.foreach { cteDef =>
cteMap(cteDef.id) = (cteDef, 0, mutable.Map.empty.withDefaultValue(0))
}
cteDefs.foreach { cteDef =>
val (_, _, refMap) = cteMap(cteDef.id)
buildCTEMap(cteDef, cteMap, Some(refMap))
buildCTEMap(cteDef, cteMap, Some(cteDef.id))
}
buildCTEMap(child, cteMap, outerRefMap)
buildCTEMap(child, cteMap, outerCTEId)

case ref: CTERelationRef =>
val (cteDef, refCount, refMap) = cteMap(ref.cteId)
cteMap(ref.cteId) = (cteDef, refCount + 1, refMap)
outerRefMap.foreach(_(ref.cteId) += 1)
outerCTEId.foreach { cteId =>
val (_, _, outerRefMap) = cteMap(cteId)
outerRefMap(ref.cteId) += 1
}

case _ =>
if (plan.containsPattern(CTE)) {
plan.children.foreach { child =>
buildCTEMap(child, cteMap, outerRefMap)
buildCTEMap(child, cteMap, outerCTEId)
Copy link
Contributor

@cloud-fan cloud-fan Apr 21, 2023

Choose a reason for hiding this comment

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

is this duplicated? If plan is WithCTE, we should have already invoked buildCTEMap for CTE relations in https://github.com/apache/spark/pull/40856/files#diff-1c15413e5d63f78fff1db3dec9df4a671e78b76d086104d81f4a967eb2800805R82

Copy link
Contributor

@cloud-fan cloud-fan Apr 21, 2023

Choose a reason for hiding this comment

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

nvm, this is the case _ branch.

}

plan.expressions.foreach { expr =>
if (expr.containsAllPatterns(PLAN_EXPRESSION, CTE)) {
expr.foreach {
case e: SubqueryExpression => buildCTEMap(e.plan, cteMap, outerRefMap)
case e: SubqueryExpression => buildCTEMap(e.plan, cteMap, outerCTEId)
case _ =>
}
}
Expand Down