Skip to content

add test and correct logic for failed replace on never used slot #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add test and correct logic for failed replace on never used slot #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/cliffc/high_scale_lib/NonBlockingHashMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ private static final Object putIfMatch( final NonBlockingHashMap topmap, final O
(expVal != MATCH_ANY || V == TOMBSTONE || V == null) &&
!(V==null && expVal == TOMBSTONE) && // Match on null/TOMBSTONE combo
(expVal == null || !expVal.equals(V)) ) // Expensive equals check at the last
return V; // Do not update!
return (V==null && expVal!=null) ? TOMBSTONE : V; // Do not update!

// Actually change the Value in the Key,Value pair
if( CAS_val(kvs, idx, V, putval ) ) {
Expand Down
1 change: 1 addition & 0 deletions src/test/java/org/cliffc/high_scale_lib/NonBlockingHashMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public boolean equals( Object o ) {
// Test some basic stuff; add a few keys, remove a few keys
public void testBasic() {
assertTrue ( _nbhm.isEmpty() );
assertThat ( _nbhm.replace("k0","v0"), nullValue() );
assertThat ( _nbhm.putIfAbsent("k1","v1"), nullValue() );
checkSizes (1);
assertThat ( _nbhm.putIfAbsent("k2","v2"), nullValue() );
Expand Down