[SPARK-54339][SQL] Fix AttributeMap non-determinism #53044
+281
−3
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
andylam-db
approved these changes
Nov 13, 2025
Comment on lines
-51
to
59
| override def + [B1 >: A](kv: (Attribute, B1)): AttributeMap[B1] = | ||
| AttributeMap(baseMap.values.toMap + kv) | ||
| new AttributeMap(baseMap + (kv._1.exprId -> kv)) | ||
|
|
||
| override def updated[B1 >: A](key: Attribute, value: B1): Map[Attribute, B1] = | ||
| baseMap.values.toMap + (key -> value) | ||
| this + (key -> value) | ||
|
|
||
| override def iterator: Iterator[(Attribute, A)] = baseMap.valuesIterator | ||
|
|
||
| override def removed(key: Attribute): Map[Attribute, A] = baseMap.values.toMap - key | ||
| override def removed(key: Attribute): Map[Attribute, A] = new AttributeMap(baseMap - key.exprId) | ||
|
|
Contributor
There was a problem hiding this comment.
To be clear for other reviewers: Converting the internal baseMap to a regular Map[Attribute, A] that hashes on Attribute objects directly is the problem here.
Contributor
|
Do we need to backport to previous versions of Spark? @cloud-fan |
cloud-fan
approved these changes
Nov 13, 2025
Contributor
|
yea we should backport |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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?
This PR fixes the
+,updated, andremovedmethods ofAttributeMapto correctly hash withAttribute.ExprIdinstead ofAttributeas a whole.Why are the changes needed?
This change fixes non-determinism with the
AttributeMapwhen an entry is being added to theAttributeMapwith+such thatattr1 != attr2butattr1.exprId = attr2.exprId.Does this PR introduce any user-facing change?
No.
How was this patch tested?
Added a new test suite.
Was this patch authored or co-authored using generative AI tooling?
Tests were generated by Claude Code on Sonnet 4.5.