Core: Fix equality in StructLikeMap #9236
Merged
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
aokolnychyi
commented
Dec 6, 2023
| @@ -146,25 +145,19 @@ public R getValue() { | |||
|
|
|||
| @Override | |||
| public int hashCode() { | |||
| int hashCode = getKey().hashCode(); | |||
There was a problem hiding this comment.
This was also throwing NPE cause key could be null. Not anymore.
There was a problem hiding this comment.
Also, getKey().hashCode() meant we used the hash of the actual element, not the wrapper.
aokolnychyi
commented
Dec 6, 2023
| return false; | ||
| } else { | ||
| StructLikeEntry that = (StructLikeEntry<R>) o; | ||
| return Objects.equals(getKey(), that.getKey()) |
There was a problem hiding this comment.
We used getKey() which unwrapped the object and we were loosing proper equality.
| @@ -147,4 +149,32 @@ public void testKeysWithNulls() { | |||
|
|
|||
| assertThat(map.remove(record3)).isEqualTo("aaa"); | |||
| } | |||
|
|
|||
| @Test | |||
| public void testEqualsAndHashCode() { | |||
There was a problem hiding this comment.
Can we do a quick addition of a test for empty map equality? I am pretty sure that is fine but just to be complete
There was a problem hiding this comment.
Sure, I'll add that.
RussellSpitzer
approved these changes
Dec 6, 2023
|
Thanks, @RussellSpitzer! |
This was referenced Dec 11, 2023
lisirrx
pushed a commit
to lisirrx/iceberg
that referenced
this pull request
Jan 4, 2024
devangjhabakh
pushed a commit
to cdouglas/iceberg
that referenced
this pull request
Apr 22, 2024
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.
This PR fixes equality in
StructLikeMap. See tests for use cases that previously failed.