[SPARK-48047][SQL] Reduce memory pressure of empty TreeNode tags #46285
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
JoshRosen
reviewed
Apr 29, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala
Show resolved
Hide resolved
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala
Outdated
Show resolved
Hide resolved
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala
Show resolved
Hide resolved
kelvinjian-db
approved these changes
Apr 29, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala
Outdated
Show resolved
Hide resolved
|
|
||
| def getTagValue[T](tag: TreeNodeTag[T]): Option[T] = { | ||
| tags.get(tag).map(_.asInstanceOf[T]) | ||
| if (_tags eq null) { |
Contributor
There was a problem hiding this comment.
I think it makes sense to add a comment clarifying the intent of using both _tags and tags here -- "To avoid initializing the tags when getTagValue is called on a TreeNode without any tags set"
Contributor
Author
There was a problem hiding this comment.
Hm, I think the intent is clear enough as is
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala
Show resolved
Hide resolved
nikhilsheoran-db
approved these changes
Apr 29, 2024
JoshRosen
approved these changes
Apr 29, 2024
kelvinjian-db
approved these changes
Apr 29, 2024
Member
|
test failures look unrelated. |
dongjoon-hyun
approved these changes
May 1, 2024
Member
dongjoon-hyun
left a comment
dongjoon-hyun
left a comment
There was a problem hiding this comment.
+1, LGTM. Thank you, @n-young-db and all.
Member
|
Merged to master for Apache Spark 4.0.0. |
andylam-db
reviewed
May 6, 2024
| // so we make a compromise here to copy tags to node with no tags | ||
| if (tags.isEmpty) { | ||
| if (isTagsEmpty && !other.isTagsEmpty) { | ||
| tags ++= other.tags |
Contributor
There was a problem hiding this comment.
Since tags are def, doesn't this line mutate nothing?
Contributor
There was a problem hiding this comment.
Ah, the map is probably pass-by reference.
JacobZheng0927
pushed a commit
to JacobZheng0927/spark
that referenced
this pull request
May 11, 2024
### What changes were proposed in this pull request? - Changed the `tags` variable of the `TreeNode` class to initialize lazily. This will reduce unnecessary driver memory pressure. ### Why are the changes needed? - Plans with large expression or operator trees are known to cause driver memory pressure; this is one step in alleviating that issue. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing UT covers behavior. Outwards facing behavior does not change. ### Was this patch authored or co-authored using generative AI tooling? No Closes apache#46285 from n-young-db/treenode-tags. Authored-by: Nick Young <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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?
tagsvariable of theTreeNodeclass to initialize lazily. This will reduce unnecessary driver memory pressure.Why are the changes needed?
Does this PR introduce any user-facing change?
No.
How was this patch tested?
Existing UT covers behavior. Outwards facing behavior does not change.
Was this patch authored or co-authored using generative AI tooling?
No