Skip to content

[SPARK-16100] [SQL] avoid crash in TreeNode.withNewChildren #13811

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
inouehrs wants to merge 1 commit into from
Closed

[SPARK-16100] [SQL] avoid crash in TreeNode.withNewChildren #13811

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,10 @@ abstract class TreeNode[BaseType <: TreeNode[BaseType]] extends Product {
case s: StructType => s // Don't convert struct types to some other type of Seq[StructField]
// Handle Seq[TreeNode] in TreeNode parameters.
case s: Seq[_] => s.map {
case arg: TreeNode[_] if containsChild(arg) =>
case arg: TreeNode[_] if containsChild(arg) && remainingOldChildren.size > 0 =>
val newChild = remainingNewChildren.remove(0)
val oldChild = remainingOldChildren.remove(0)
assert(arg == oldChild)
if (newChild fastEquals oldChild) {
oldChild
} else {
Expand All @@ -214,9 +215,10 @@ abstract class TreeNode[BaseType <: TreeNode[BaseType]] extends Product {
case null => null
}
case m: Map[_, _] => m.mapValues {
case arg: TreeNode[_] if containsChild(arg) =>
case arg: TreeNode[_] if containsChild(arg) && remainingOldChildren.size > 0 =>
val newChild = remainingNewChildren.remove(0)
val oldChild = remainingOldChildren.remove(0)
assert(arg == oldChild)
if (newChild fastEquals oldChild) {
oldChild
} else {
Expand All @@ -226,9 +228,10 @@ abstract class TreeNode[BaseType <: TreeNode[BaseType]] extends Product {
case nonChild: AnyRef => nonChild
case null => null
}.view.force // `mapValues` is lazy and we need to force it to materialize
case arg: TreeNode[_] if containsChild(arg) =>
case arg: TreeNode[_] if containsChild(arg) && remainingOldChildren.size > 0 =>
val newChild = remainingNewChildren.remove(0)
val oldChild = remainingOldChildren.remove(0)
assert(arg == oldChild)
if (newChild fastEquals oldChild) {
oldChild
} else {
Expand Down