[SPARK-50441][SQL] Fix parametrized identifiers not working when referencing CTEs #48994
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13f2813 to
032882d
Compare
cee2c1e to
bdbb221
Compare
cloud-fan
reviewed
Nov 29, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CTESubstitution.scala
Show resolved
Hide resolved
cloud-fan
reviewed
Nov 29, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CTESubstitution.scala
Outdated
Show resolved
Hide resolved
cloud-fan
reviewed
Nov 29, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CTESubstitution.scala
Outdated
Show resolved
Hide resolved
cloud-fan
reviewed
Nov 29, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CTESubstitution.scala
Show resolved
Hide resolved
cloud-fan
reviewed
Nov 29, 2024
| // but we can't do it here as `PlanWithUnresolvedIdentifier` is a leaf node | ||
| // and may produce `UnresolvedRelation` later. | ||
| // Here we wrap it with `UnresolvedWithCTERelations` so that we can | ||
| // delay the CTE relations lookup after `PlanWithUnresolvedIdentifier` is resolved. |
There was a problem hiding this comment.
This part of the comment needs an update, we now use a different planBuilder to delay the CTE lookup.
bdbb221 to
a40824c
Compare
cloud-fan
approved these changes
Nov 29, 2024
|
@cloud-fan Failures seem unrelated, same test is failing in other PRs as well. Can you check please? |
|
The streaming failure is unrelated, I'm merging it to master, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Fix parametrized identifiers not working when referencing CTEs
Why are the changes needed?
For a query:
with t1 as (select 1) select * from identifier(:cte) using cte as "t1"the resolution fails because
BindParameterscan't resolve parameters because it waits forResolveIdentifierClauseto resolveUnresolvedWithCTERelation, butResolveIdentifierClausecan't resolveUnresolvedWithCTERelationuntil allNamedParametersin the plan are resolved.Instead of delaying CTE resolution with
UnresolvedWithCTERelation, we can remove node entirely and delay the resolution by keeping the originalPlanWithUnresolvedIdentifierand moving the CTE resolution to itsplanBuilder.Does this PR introduce any user-facing change?
No
How was this patch tested?
Added a new test to
ParametersSuiteWas this patch authored or co-authored using generative AI tooling?
No