[SPARK-45584][SQL] Fix subquery execution failure with TakeOrderedAndProjectExec #43419
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 |
cloud-fan
reviewed
Oct 18, 2023
| @@ -299,6 +301,11 @@ case class TakeOrderedAndProjectExec( | |||
| } | |||
| } | |||
|
|
|||
| private def prepareAndWaitForSubqueries(): Unit = { | |||
There was a problem hiding this comment.
instead of adding this method, shall we just call executeQuery in executeCollect?
There was a problem hiding this comment.
There was a problem hiding this comment.
Sg. Just want to make sure RDDOperationScope.withScope does not any side effect right?
There was a problem hiding this comment.
It's the same with this one, plus some tracking logic
cloud-fan
reviewed
Oct 18, 2023
| @@ -283,6 +283,8 @@ case class TakeOrderedAndProjectExec( | |||
| } | |||
|
|
|||
| override def executeCollect(): Array[InternalRow] = { | |||
There was a problem hiding this comment.
Suggested change
| override def executeCollect(): Array[InternalRow] = { | |
| override def executeCollect(): Array[InternalRow] = executeQuery { |
cloud-fan
approved these changes
Oct 20, 2023
|
thanks, merging to master/3.5! |
cloud-fan
pushed a commit
that referenced
this pull request
Oct 20, 2023
…ProjectExec This PR fixes a bug when there are subqueries in `TakeOrderedAndProjectExec`. The executeCollect method does not wait for subqueries to finish and it can result in IllegalArgumentException when executing a simple query. For example this query: ``` WITH t2 AS ( SELECT * FROM t1 ORDER BY id ) SELECT *, (SELECT COUNT(*) FROM t2) FROM t2 LIMIT 10 ``` will fail with this error ``` java.lang.IllegalArgumentException: requirement failed: Subquery subquery#242, [id=#109] has not finished ``` To fix a bug. No New unit test No Closes #43419 from allisonwang-db/spark-45584-subquery-failure. Authored-by: allisonwang-db <allison.wang@databricks.com> Signed-off-by: Wenchen Fan <wenchen@databricks.com> (cherry picked from commit 8fd915f) Signed-off-by: Wenchen Fan <wenchen@databricks.com>
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 PR fixes a bug when there are subqueries in
TakeOrderedAndProjectExec. The executeCollect method does not wait for subqueries to finish and it can result in IllegalArgumentException when executing a simple query.For example this query:
will fail with this error
Why are the changes needed?
To fix a bug.
Does this PR introduce any user-facing change?
No
How was this patch tested?
New unit test
Was this patch authored or co-authored using generative AI tooling?
No