-
Notifications
You must be signed in to change notification settings - Fork 28.3k
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.
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
[SPARK-45584][SQL] Fix subquery execution failure with TakeOrderedAndProjectExec #43419
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -283,6 +283,8 @@ case class TakeOrderedAndProjectExec( | |
} | ||
|
||
override def executeCollect(): Array[InternalRow] = { | ||
// SPARK-45584: Wait for subquery execution to finish before executing collect. | ||
prepareAndWaitForSubqueries() | ||
val orderingSatisfies = SortOrder.orderingSatisfies(child.outputOrdering, sortOrder) | ||
val ord = new LazilyGeneratedOrdering(sortOrder, child.output) | ||
val limited = if (orderingSatisfies) { | ||
|
@@ -299,6 +301,11 @@ case class TakeOrderedAndProjectExec( | |
} | ||
} | ||
|
||
private def prepareAndWaitForSubqueries(): Unit = { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. instead of adding this method, shall we just call There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sg. Just want to make sure There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's the same with this one, plus some tracking logic |
||
prepare() | ||
waitForSubqueries() | ||
} | ||
|
||
private val serializer: Serializer = new UnsafeRowSerializer(child.output.size) | ||
|
||
private lazy val writeMetrics = | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.