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

Timestamp:

01/05/17 17:36:50 (7 years ago)

Author:

jkarder

Message:

#2520: worked on persistence

File:

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

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

@@ -27 +27 @@
 namespace HeuristicLab.Persistence {
   public sealed class Mapper {
+    internal class MappingEqualityComparer : IEqualityComparer<object> {
+      bool IEqualityComparer<object>.Equals(object x, object y) {
+        if (x == null && y == null) return true;
+        if (x == null ^ y == null) return false;
+        if (x.GetType() != y.GetType()) return false;
+
+        var type = x.GetType();
+        if (type.IsValueType || type == typeof(string)) return x.Equals(y);
+        return object.ReferenceEquals(x, y);
+      }
+
+      int IEqualityComparer<object>.GetHashCode(object obj) {
+        return obj == null ? 0 : obj.GetHashCode();
+      }
+    }
+
     private static StaticCache staticCache = null;
     private static object locker = new object();
@@ -41 +57 @@
     private Index<Type> types;
     private Index<string> strings;
-    private Index<Box> boxes;
+    private Dictionary<uint, Box> boxId2Box;
     private Dictionary<object, uint> object2BoxId;
     private Dictionary<uint, object> boxId2object;
 
-    public long BoxCount { get; private set; }
+    public uint BoxCount { get; private set; }
 
     public Mapper() {
@@ -51 +67 @@
       types = new Index<Type>();
       strings = new Index<string>();
-      boxes = new Index<Box>();
-      object2BoxId = new Dictionary<object, uint>(new ReferenceEqualityComparer<object>());
+      boxId2Box = new Dictionary<uint, Box>();
+      object2BoxId = new Dictionary<object, uint>(new MappingEqualityComparer());
       boxId2object = new Dictionary<uint, object>();
 
@@ -81 +97 @@
     public uint GetBoxId(object o) {
       uint boxId;
-      if (object2BoxId.TryGetValue(o, out boxId)) return boxId;
 
       if (o == null)
-        boxId = boxes.GetIndex(null);
+        boxId = 0;
       else {
+        if (object2BoxId.TryGetValue(o, out boxId)) return boxId;
         var type = o.GetType();
         var typeInfo = StaticCache.GetTypeInfo(type);
         if (typeInfo.Transformer == null) throw new ArgumentException("Cannot serialize object of type " + o.GetType());
-        BoxCount++;
+        boxId = ++BoxCount;
         typeInfo.Used++;
-        boxId = boxes.GetIndex(typeInfo.Transformer.ToBox(o, this));
+        object2BoxId.Add(o, boxId);
+        boxId2Box.Add(boxId, typeInfo.Transformer.ToBox(o, this));
       }
-      object2BoxId.Add(o, boxId);
       return boxId;
     }
@@ -100 +116 @@
       if (boxId2object.TryGetValue(boxId, out o)) return o;
 
-      var box = this.boxes.GetValue(boxId);
+      Box box;
+      boxId2Box.TryGetValue(boxId, out box);
+
       if (box == null)
         o = null;
@@ -106 +124 @@
         var transformer = transformers.GetValue(box.TransformerId);
         o = transformer.ToObject(box, this);
+        boxId2object.Add(boxId, o);
+        transformer.FillFromBox(o, box, this);
       }
-      boxId2object.Add(boxId, o);
       return o;
     }
@@ -122 +141 @@
       bundle.AddRangeTypeGuids(mapper.types.GetValues().Select(x => StaticCache.GetGuid(x)).Select(x => ByteString.CopyFromUtf8(x)));
       bundle.AddRangeStrings(mapper.strings.GetValues());
-      bundle.AddRangeBoxes(mapper.boxes.GetValues());
+      bundle.AddRangeBoxes(mapper.boxId2Box.OrderBy(x => x.Key).Select(x => x.Value));
       return bundle.Build();
     }
@@ -129 +148 @@
       mapper.types = new Index<Type>(bundle.TypeGuidsList.Select(x => x.ToStringUtf8()).Select(x => StaticCache.GetType(x)));
       mapper.strings = new Index<string>(bundle.StringsList);
-      mapper.boxes = new Index<Box>(bundle.BoxesList);
+      mapper.boxId2Box = bundle.BoxesList.Select((b, i) => new { Box = b, Index = i }).ToDictionary(k => (uint)k.Index + 1, v => v.Box);
       mapper.transformers = new Index<ITransformer>(bundle.TransformerGuidsList.Select(x => new Guid(x.ToByteArray())).Select(x => StaticCache.GetTransformer(x)));
       return mapper.GetObject(bundle.RootBoxId);