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

Revert "Optimize copy!(::Dict, ::Dict)" #35739

Merged
merged 1 commit into from
May 5, 2020
Merged

Revert "Optimize copy!(::Dict, ::Dict)" #35739

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
54 changes: 0 additions & 54 deletions base/dict.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,60 +274,6 @@ function empty!(h::Dict{K,V}) where V where K
return h
end

# Fast pass for exactly same `Dict` type:
function copy!(dst::D, src::D) where {D <: Dict}
copy!(dst.vals, src.vals)
copy!(dst.keys, src.keys)
copy!(dst.slots, src.slots)
dst.ndel = src.ndel
dst.count = src.count
dst.age = src.age
dst.idxfloor = src.idxfloor
dst.maxprobe = src.maxprobe
return dst
end

# Fast pass when not changing key types (hence not changing hashes).
# It is unsafe to call this function in the sense it may leave `dst`
# in a state that is unsafe to use after `unsafe_copy!` failed.
function unsafe_copy!(dst::Dict, src::Dict)
resize!(dst.vals, length(src.vals))
resize!(dst.keys, length(src.keys))

svals = src.vals
skeys = src.keys
dvals = dst.vals
dkeys = dst.keys
@inbounds for i = src.idxfloor:lastindex(svals)
if isslotfilled(src, i)
dvals[i] = svals[i]
dkeys[i] = skeys[i]
end
end

copy!(dst.slots, src.slots)

dst.ndel = src.ndel
dst.count = src.count
dst.age = src.age
dst.idxfloor = src.idxfloor
dst.maxprobe = src.maxprobe
return dst
end

function copy!(dst::Dict{Kd}, src::Dict{Ks}) where {Kd, Ks<:Kd}
try
return unsafe_copy!(dst, src)
catch
empty!(dst) # avoid leaving `dst` in a corrupt state
rethrow()
end
end

# It's safe to call `unsafe_copy!` if `Vd>:Vs`:
copy!(dst::Dict{Kd,Vd}, src::Dict{Ks,Vs}) where {Kd, Ks<:Kd, Vd, Vs<:Vd} =
unsafe_copy!(dst, src)

# get the index where a key is stored, or -1 if not present
function ht_keyindex(h::Dict{K,V}, key) where V where K
sz = length(h.keys)
Expand Down
32 changes: 5 additions & 27 deletions test/dict.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,35 +1071,13 @@ end
end

@testset "copy!" begin
@testset "copy!(::$(typeof(s)), _)" for s in Any[
Dict(1 => 2, 2 => 3), # concrete key type
Dict{Union{Int,UInt},Int}(1 => 2, 2 => 3), # union key type
Dict{Any,Int}(1 => 2, 2 => 3), # abstract key type
Dict{Int,Float64}(1 => 2, 2 => 3), # values are converted
]
@testset "copy!(_, ::$(typeof(Dict(a))))" for a in Any[
[3 => 4],
[0x3 => 0x4],
[3 => 4, 5 => 6, 7 => 8],
Pair{UInt,UInt}[3=>4, 5=>6, 7=>8],
]
if s isa Dict{Union{Int,UInt},Int} && a isa Vector{Pair{UInt8,UInt8}}
@test_broken s === copy!(s, Dict(a)) == Dict(a)
continue
end
@test s === copy!(s, Dict(a)) == Dict(a)
if length(a) == 1 # current limitation of Base.ImmutableDict
@test s === copy!(s, Base.ImmutableDict(a[])) == Dict(a[])
end
s = Dict(1=>2, 2=>3)
for a = ([3=>4], [0x3=>0x4], [3=>4, 5=>6, 7=>8], Pair{UInt,UInt}[3=>4, 5=>6, 7=>8])
@test s === copy!(s, Dict(a)) == Dict(a)
if length(a) == 1 # current limitation of Base.ImmutableDict
@test s === copy!(s, Base.ImmutableDict(a[])) == Dict(a[])
end
end

@testset "no corruption on failed copy!" begin
dst = Dict{Int,Int}(1 => 2)
# Fails while trying `convert`:
@test_throws MethodError copy!(dst, Dict(1 => "2"))
@test dst == Dict()
end
end

@testset "map!(f, values(dict))" begin
Expand Down