[SPARK-43376][SQL][FOLLOWUP] lazy construct subquery to improve reuse subquery #41454
Conversation
This file contains hidden or 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
Contributor
Author
cloud-fan
reviewed
Jun 5, 2023
| val subquery = SubqueryExec.createForScalarSubquery( | ||
| s"subquery#${exprId.id}", executedPlan) | ||
| subqueryMap.put(exprId.id, subquery) | ||
| subqueryMap.put(exprId.id, executedPlan) |
Contributor
There was a problem hiding this comment.
seems now all subqueries have the same handling code, can we just match the logical subqueries here and build the map?
Contributor
Author
There was a problem hiding this comment.
yeas, cleaned up these code
cloud-fan
reviewed
Jun 6, 2023
| name, broadcastKeyIndex, onlyInBroadcast, | ||
| buildPlan, buildKeys, executedPlan) | ||
| subqueryMap.put(exprId.id, subquery) | ||
| case subquery: SubqueryExpression if !subqueryMap.contains(subquery.exprId.id) => |
Contributor
There was a problem hiding this comment.
to be conservative, how about case subquery @ (_: ScalarSubquery | _: InSubquery | _: DynamicPruningSubquery) => ...
cloud-fan
approved these changes
Jun 6, 2023
Contributor
Author
|
@cloud-fan the failed test seems irrelevant |
Contributor
|
thanks, merging to master! |
czxm
pushed a commit
to czxm/spark
that referenced
this pull request
Jun 12, 2023
… subquery ### What changes were proposed in this pull request? apache#41046 make `ReuseAdaptiveSubquery` become not idempotent. This pr reverts the change in `ReuseAdaptiveSubquery`. To solve the same instance issue when planning and reusing subquery in AQE, this pr makes `subqueryMap` hold the executed plan in subquery. Then in `PlanAdaptiveSubqueries`, each logical subquery plan can build their own instance of physical subquery. ### Why are the changes needed? To improve reuse subquery in AQE. ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? Pass CI Closes apache#41454 from ulysses-you/SPARK-43376-2. Authored-by: ulysses-you <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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?
#41046 make
ReuseAdaptiveSubquerybecome not idempotent. This pr reverts the change inReuseAdaptiveSubquery.To solve the same instance issue when planning and reusing subquery in AQE, this pr makes
subqueryMaphold the executed plan in subquery. Then inPlanAdaptiveSubqueries, each logical subquery plan can build their own instance of physical subquery.Why are the changes needed?
To improve reuse subquery in AQE.
Does this PR introduce any user-facing change?
no
How was this patch tested?
Pass CI