Merge pull request #629 from JuliaIO/ib/fix_union_upgrade

Fix unions for upgrades on mutable structs

Author: JonasIsensee

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.5.11
+ - Make `Upgrade` work for types that sit inside `Union{..}`
+
 ## 0.5.10
  - fix regression for `UInt32`
  - **Deprecation**: Do not rely on JLD2 to load a compression library. This feature will be removed in a future release. Instead explicitly add `using` statements into your scripts.

Project.toml

@@ -1,6 +1,6 @@
 name = "JLD2"
 uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
-version = "0.5.10"
+version = "0.5.11"
 
 [deps]
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"

src/data/reconstructing_datatypes.jl

@@ -333,6 +333,7 @@ function types_from_refs(f::JLDFile, ptr::Ptr)
             nulldt = CommittedDatatype(UNDEFINED_ADDRESS, 0)
             cdt = get(f.datatype_locations, ref, nulldt)
             res = cdt !== nulldt ? julia_repr(jltype(f, cdt)) : load_dataset(f, ref)
+            res isa Upgrade && (res = res.target)
             unknown_params |= isunknowntype(res) || isreconstructed(res)
             res
         end for ref in refs]
@@ -353,8 +354,6 @@ function jlconvert(rr::MappedRepr{<:Type,DataTypeODR},
     params = map(params) do p
         if p isa Union{Int64,Int32}
             Int(p)
-        elseif p isa Upgrade
-            p.target
         else
             p
         end

test/loadsave.jl

@@ -726,6 +726,8 @@ module DummyModule
     end
     JLD2.rconvert(::Type{CC}, nt::NamedTuple) = CC()
     JLD2.rconvert(::Type{BB}, nt::NamedTuple) = BB()
+    mutable struct DD end
+    JLD2.rconvert(::Type{DD}, nt::NamedTuple) = DD()
 end
 @testset "Upgrading a struct that was formerly singleton" begin
     cd(mktempdir()) do     
@@ -736,6 +738,27 @@ end
     end
 end
 
+@testset "Issue #628 Upgrading structs that contains unions" begin
+    cd(mktempdir()) do
+        @testset "immutable" begin
+            a1 = Dict("a" => [nothing DummyModule.AA()])
+            save("a.jld2", a1)
+            a2 = load("a.jld2"; typemap = Dict("Main.DummyModule.AA" => JLD2.Upgrade(DummyModule.AA)))
+            @test only(keys(a1)) == "a"
+            @test keys(a1) == keys(a2)
+            @test a1["a"] == a2["a"]
+        end
+        @testset "mutable" begin
+            a1 = Dict("a" => [nothing DummyModule.DD()])
+            save("a.jld2", a1)
+            a2 = load("a.jld2"; typemap = Dict("Main.DummyModule.DD" => JLD2.Upgrade(DummyModule.DD)))
+            @test only(keys(a1)) == "a"
+            @test keys(a1) == keys(a2)
+            @test typeof(a1["a"]) == typeof(a2["a"])
+        end
+    end
+end
+
 @testset "Issue #571 Loading Vararg NTuples" begin
     tst = [("a",), ("a", "b")]
     cd(mktempdir()) do