Skip to content
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

Jump to bottom

Fix Hash#put_if_absent putting duplicate keys #14427

Merged
merged 1 commit into from
Apr 4, 2024
Merged

Fix Hash#put_if_absent putting duplicate keys #14427

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
6 changes: 6 additions & 0 deletions spec/std/hash_spec.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ describe "Hash" do
h.should eq({1 => v, 2 => ["2"]})
h[1].should be(v)
end

it "doesn't put duplicate keys (#14425)" do
h = {1 => 2}
h.put_if_absent(3) { h[3] = 4 }.should eq(4)
h.should eq({1 => 2, 3 => 4})
end
end

describe "update" do
Expand Down
54 changes: 1 addition & 53 deletions src/hash.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,56 +419,6 @@ class Hash(K, V)
end
end

# Inserts a key-value pair. Assumes that the given key doesn't exist.
private def insert_new(key, value)
# Unless otherwise noted, this body should be identical to `#upsert`

if @entries.null?
@indices_size_pow2 = 3
@entries = malloc_entries(4)
end

hash = key_hash(key)

if @indices.null?
# don't call `#update_linear_scan` here

if !entries_full?
add_entry_and_increment_size(hash, key, value)
return
end

resize

if @indices.null?
add_entry_and_increment_size(hash, key, value)
return
end
end

index = fit_in_indices(hash)

while true
entry_index = get_index(index)

if entry_index == -1
if entries_full?
resize
index = fit_in_indices(hash)
next
end

set_index(index, entries_size)
add_entry_and_increment_size(hash, key, value)
return
end

# don't call `#get_entry` and `#entry_matches?` here

index = next_index(index)
end
end

# Tries to update a key-value-hash triplet by doing a linear scan.
# Returns an old `Entry` if it was updated, otherwise `nil`.
private def update_linear_scan(key, value, hash) : Entry(K, V)?
Expand Down Expand Up @@ -1126,7 +1076,7 @@ class Hash(K, V)
entry.value
else
value = yield key
insert_new(key, value)
upsert(key, value)
value
end
end
Expand Down Expand Up @@ -1163,8 +1113,6 @@ class Hash(K, V)
entry.value
elsif block = @block
default_value = block.call(self, key)

# NOTE: can't use `#insert_new` as `block` might add arbitrary keys
upsert(key, yield default_value)
default_value
else
Expand Down
Loading