Fix HashMap put/remove returned value for empty key after clear. #237
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
bruno-roustant
commented
May 21, 2024
| @@ -131,8 +131,8 @@ public VType put(KType key, VType value) { | |||
|
|
|||
| final int mask = this.mask; | |||
| if (Intrinsics.<KType> isEmpty(key)) { | |||
| VType previousValue = hasEmptyKey ? Intrinsics.<VType> cast(values[mask + 1]) : Intrinsics.<VType> empty(); | |||
bruno-roustant
commented
May 21, 2024
| @@ -237,6 +237,9 @@ public VType addTo(KType key, VType incrementValue) | |||
| public VType remove(KType key) { | |||
| final int mask = this.mask; | |||
| if (Intrinsics.<KType> isEmpty(key)) { | |||
| if (!hasEmptyKey) { | |||
bruno-roustant
commented
May 21, 2024
| try { | ||
| set.indexGet(set.indexOf(key2)); | ||
| fail(); |
There was a problem hiding this comment.
This fail would be caught anyway. Fix it.
bruno-roustant
commented
May 21, 2024
| @@ -393,16 +421,15 @@ public void testNullKey() | |||
| } | |||
| /*! #end !*/ | |||
|
|
|||
| /*! #if ($TemplateOptions.KTypeGeneric) !*/ | |||
There was a problem hiding this comment.
Make this randomized test run for primitive keys/values.
dweiss
approved these changes
May 21, 2024
dweiss
reviewed
May 21, 2024
There was a problem hiding this comment.
Thanks, @bruno-roustant ! I'll do a few other cleanups and I think this warrants a release!
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.
While finishing to test the small fork of HPPC in Lucene, I discovered a small bug in HashMap put and remove, in the returned value, after clear was called on the map. This is a edge case clearly, but I found a bug after 14 years of HPPC :)
This PR also adds more tests, making the randomized test against JDK HashMap run even for primitive keys/values (that revealed the small bug).