Changeset 14711 for branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/Mapper.cs

Timestamp:

03/03/17 11:41:43 (7 years ago)

Author:

gkronber

Message:

#2520

• renamed StorableClass -> StorableType
• changed persistence to use GUIDs instead of type names

File:

• branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/Mapper.cs (modified) (2 diffs)

branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/Mapper.cs

@@ -139 +139 @@
       bundle.RootBoxId = mapper.GetBoxId(o);
       bundle.AddRangeTransformerGuids(mapper.transformers.GetValues().Select(x => x.Guid).Select(x => ByteString.CopyFrom(x.ToByteArray())));
-      bundle.AddRangeTypeGuids(mapper.types.GetValues().Select(x => x.AssemblyQualifiedName ?? x.Name).Select(x => ByteString.CopyFromUtf8(x)));
+      bundle.AddRangeTypeGuids(mapper.types.GetValues().Select(x => ByteString.CopyFrom(StaticCache.GetGuid(x).ToByteArray())));
       bundle.AddRangeStrings(mapper.strings.GetValues());
       bundle.AddRangeBoxes(mapper.boxId2Box.OrderBy(x => x.Key).Select(x => x.Value));
@@ -146 +146 @@
     public static object ToObject(Bundle bundle) {
       var mapper = new Mapper();
-      mapper.types = new Index<Type>(bundle.TypeGuidsList.Select(x => x.ToStringUtf8()).Select(x => Type.GetType(x)));
+      mapper.types = new Index<Type>(bundle.TypeGuidsList.Select(x => StaticCache.GetType(new Guid(x.ToByteArray()))));
       mapper.strings = new Index<string>(bundle.StringsList);
       mapper.boxId2Box = bundle.BoxesList.Select((b, i) => new { Box = b, Index = i }).ToDictionary(k => (uint)k.Index + 1, v => v.Box);