[SPARK-51513][SQL] Fix RewriteMergeIntoTable rule produces unresolved plan #50281
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
|
cc @cloud-fan |
dongjoon-hyun
approved these changes
Mar 15, 2025
cloud-fan
reviewed
Mar 17, 2025
| @@ -1091,6 +1092,8 @@ object FoldablePropagation extends Rule[LogicalPlan] { | |||
| object SimplifyCasts extends Rule[LogicalPlan] { | |||
| def apply(plan: LogicalPlan): LogicalPlan = plan.transformAllExpressionsWithPruning( | |||
| _.containsPattern(CAST), ruleId) { | |||
| case c @ Cast(e: Attribute, StringType, _, _) | |||
There was a problem hiding this comment.
does it have to be Attribute? I think we should match NamedExpression so that nested fields can also be covered.
|
@aokolnychyi can you also take a look? |
|
LGTM |
cloud-fan
reviewed
Mar 21, 2025
| @@ -449,7 +449,8 @@ class Analyzer(override val catalogManager: CatalogManager) extends RuleExecutor | |||
| Batch("DML rewrite", fixedPoint, | |||
| RewriteDeleteFromTable, | |||
| RewriteUpdateTable, | |||
| RewriteMergeIntoTable), | |||
| RewriteMergeIntoTable, | |||
| ResolveOutputRelation), | |||
There was a problem hiding this comment.
can we add some comments to explain how these rules above can make the plan unresolved and we need to run ResolveOutputRelation to re-resolve it?
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?
This patch addresses the issue where the
RewriteMergeIntoTablerule produces an unresolved plan. The changes ensure that the MERGE INTO operation correctly handles cases where the source table contains rows that need to be inserted into the target table.Why are the changes needed?
Fix query failure.
Does this PR introduce any user-facing change?
No.
How was this patch tested?
Unit test.
Was this patch authored or co-authored using generative AI tooling?
No.