Skip to content

[SPARK-48307][SQL][FOLLOWUP] not-inlined CTE references sibling should not fail #47141

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

[SPARK-48307][SQL][FOLLOWUP] not-inlined CTE references sibling should not fail #47141

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bdfe9b
not-inlined CTE references sibling should not fail
cloud-fan Jun 28, 2024
88544e9
Update CTEInlineSuite.scala
cloud-fan Jun 28, 2024
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
15 changes: 8 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 @@ -140,25 +140,26 @@ case class InlineCTE(
cteMap: mutable.Map[Long, CTEReferenceInfo]): LogicalPlan = {
plan match {
case WithCTE(child, cteDefs) =>
val remainingDefs = cteDefs.filter { cteDef =>
val notInlined = mutable.ArrayBuffer.empty[CTERelationDef]
Copy link
Contributor Author

@cloud-fan cloud-fan Jun 28, 2024

Choose a reason for hiding this comment

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

This is also the behavior of the previous code.

cteDefs.foreach { cteDef =>
val refInfo = cteMap(cteDef.id)
if (refInfo.refCount > 0) {
val newDef = refInfo.cteDef.copy(child = inlineCTE(refInfo.cteDef.child, cteMap))
val inlineDecision = shouldInline(newDef, refInfo.refCount)
cteMap(cteDef.id) = cteMap(cteDef.id).copy(
cteDef = newDef, shouldInline = inlineDecision
)
// Retain the not-inlined CTE relations in place.
!inlineDecision
} else {
keepDanglingRelations
if (!inlineDecision) notInlined += newDef
} else if (keepDanglingRelations) {
notInlined += refInfo.cteDef
}
}
val inlined = inlineCTE(child, cteMap)
if (remainingDefs.isEmpty) {
if (notInlined.isEmpty) {
inlined
} else {
WithCTE(inlined, remainingDefs)
// Retain the not-inlined CTE relations in place.
WithCTE(inlined, notInlined.toSeq)
}

case ref: CTERelationRef =>
Expand Down
13 changes: 13 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/CTEInlineSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,19 @@ abstract class CTEInlineSuiteBase
checkErrorTableNotFound(e, "`tab_non_exists`", ExpectedContext("tab_non_exists", 83, 96))
}
}

test("SPARK-48307: not-inlined CTE references sibling") {
withTempView("t") {
Copy link
Member

@yaooqinn yaooqinn Jun 28, 2024

Choose a reason for hiding this comment

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

I can't find where you create or use this view

Copy link
Contributor Author

@cloud-fan cloud-fan Jun 28, 2024

Choose a reason for hiding this comment

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

ah I copied it from other test but didn't end up using it. Let me remove

val df = sql(
"""
|WITH
|v1 AS (SELECT 1 col),
|v2 AS (SELECT col, rand() FROM v1)
|SELECT l.col FROM v2 l JOIN v2 r ON l.col = r.col
|""".stripMargin)
checkAnswer(df, Row(1))
}
}
}

class CTEInlineSuiteAEOff extends CTEInlineSuiteBase with DisableAdaptiveExecutionSuite
Expand Down