Skip to content

[SPARK-54595][SQL] Keep existing behavior of MERGE INTO without SCHEMA EVOLUTION clause #53326

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
szehon-ho wants to merge 2 commits into from
+711 −786
Closed

[SPARK-54595][SQL] Keep existing behavior of MERGE INTO without SCHEMA EVOLUTION clause #53326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
323ae36
[SPARK-54595][SQL] Keep existing behavior without SCHEMA EVOLUTION cl…
szehon-ho Dec 4, 2025
1e078b7
Fix test
szehon-ho Dec 5, 2025
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
10 changes: 4 additions & 6 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,9 +1736,8 @@ class Analyzer(
Assignment(key, sourceAttr)
}
} else {
sourceTable.output.flatMap { sourceAttr =>
findAttrInTarget(sourceAttr.name).map(
targetAttr => Assignment(targetAttr, sourceAttr))
targetTable.output.map { attr =>
Assignment(attr, UnresolvedAttribute(Seq(attr.name)))
}
}
UpdateAction(
Expand Down Expand Up @@ -1775,9 +1774,8 @@ class Analyzer(
Assignment(key, sourceAttr)
}
} else {
sourceTable.output.flatMap { sourceAttr =>
findAttrInTarget(sourceAttr.name).map(
targetAttr => Assignment(targetAttr, sourceAttr))
targetTable.output.map { attr =>
Assignment(attr, UnresolvedAttribute(Seq(attr.name)))
}
}
InsertAction(
Expand Down
2 changes: 1 addition & 1 deletion ...main/scala/org/apache/spark/sql/catalyst/analysis/ResolveRowLevelCommandAssignments.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ object ResolveRowLevelCommandAssignments extends Rule[LogicalPlan] {
case m: MergeIntoTable if !m.skipSchemaResolution && m.resolved && m.rewritable && !m.aligned &&
!m.needSchemaEvolution =>
validateStoreAssignmentPolicy()
val coerceNestedTypes = SQLConf.get.coerceMergeNestedTypes
val coerceNestedTypes = SQLConf.get.coerceMergeNestedTypes && m.withSchemaEvolution
m.copy(
targetTable = cleanAttrMetadata(m.targetTable),
matchedActions = alignActions(m.targetTable.output, m.matchedActions,
Expand Down
Loading