Changeset 14771 for branches/PersistenceOverhaul/HeuristicLab.Persistence

Timestamp:

03/20/17 15:56:55 (8 years ago)

Author:

gkronber

Message:

#2520 added versions to storable types and implemented conversion unit test

Location:

branches/PersistenceOverhaul/HeuristicLab.Persistence

Files:

• 3.3/Default/CompositeSerializers/Storable/StorableTypeAttribute.cs (modified) (2 diffs)
• 4.0/Core/Mapper.cs (modified) (1 diff)
• 4.0/Core/StorableConversionAttribute.cs (added)
• 4.0/HeuristicLab.Persistence-4.0.csproj (modified) (1 diff)
• 4.0/Protos/PersistenceMessages.proto (modified) (2 diffs)
• 4.0/Transformers/StorableClassTransformer.cs (modified) (3 diffs)
• 4.0/Transformers/Transformers.cs (modified) (1 diff)

branches/PersistenceOverhaul/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableTypeAttribute.cs

@@ -37 +37 @@
 
     public Guid Guid { get; private set; }
-    public bool Released { get; set; }
+    public uint Version { get; set; }
 
     /// <summary>
@@ -43 +43 @@
     /// </summary>
     /// <param name="memberSelection">The storable class memberSelection.</param>
-    public StorableTypeAttribute(StorableMemberSelection memberSelection, string guid) {
+    public StorableTypeAttribute(StorableMemberSelection memberSelection, string guid, uint version = 1) {
       MemberSelection = memberSelection;
       Guid = new Guid(guid);
-      Released = false;
+      Version = version;
     }
 
-    public StorableTypeAttribute(string guid) {
+    public StorableTypeAttribute(string guid, uint version = 1) {
       Guid = new Guid(guid);
-      Released = false;
+      Version = version;
     }
 

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

@@ -95 +95 @@
     }
 
+    public Box GetBox(uint boxId) {
+      return boxId2Box[boxId];
+    }
     public uint GetBoxId(object o) {
       uint boxId;

branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/HeuristicLab.Persistence-4.0.csproj

@@ -55 +55 @@
     <Compile Include="Core\Serializer.cs" />
     <Compile Include="Core\Transformer.cs" />
+    <Compile Include="Core\StorableConversionAttribute.cs" />
     <Compile Include="Core\TransformerAttribute.cs" />
     <Compile Include="Core\TypeInfo.cs" />

branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Protos/PersistenceMessages.proto

@@ -11 +11 @@
 message Box {
   optional uint32 transformer_id = 1;
-  optional uint32 type_id = 2;
+  optional uint32 type_id = 2; 
 
   extensions 100 to max;
@@ -177 +177 @@
     required TypeBox type = 250;
   }
-  repeated uint32 generic_type_ids = 1 [packed = true];
+  optional uint32 version = 1;
+  repeated uint32 generic_type_ids = 2 [packed = true];
 }
 

branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Transformers/StorableClassTransformer.cs

@@ -70 +70 @@
       var type = obj.GetType();
       var typeInfo = Mapper.StaticCache.GetTypeInfo(type);
+      var typeBox = mapper.GetBox(box.TypeId).GetExtension(TypeBox.Type);
+      var version = typeBox.HasVersion ? typeBox.Version : 1;
 
       var components = new Dictionary<uint, uint>();
@@ -76 +78 @@
       }
 
+      var conversionMethods =
+        type.GetMethods(BindingFlags.NonPublic | BindingFlags.Static)
+          .Where(StorableConversionAttribute.IsStorableConversionMethod)
+          .Where(mi => StorableConversionAttribute.GetVersion(mi) >= version)
+          .OrderBy(StorableConversionAttribute.GetVersion);
+
+      // put all objects into dictionary for optional conversion
+      var dict = new Dictionary<string, object>();
+      foreach (var component in components) {
+        dict.Add(mapper.GetString(component.Key), mapper.GetObject(component.Value));
+      }
+      
+      // TODO: check that all entries in the dictionary can be mapped to a field or property
+      foreach (var convMeth in conversionMethods) {
+        dict = (Dictionary<string, object>)convMeth.Invoke(null, new object[] { dict });
+      }
+
       foreach (var componentInfo in typeInfo.Fields) {
         var field = (FieldInfo)componentInfo.MemberInfo;
-        uint componentId;
-        bool found = components.TryGetValue(mapper.GetStringId(componentInfo.Name), out componentId);
+        object val = null;
+        bool found = dict.TryGetValue(componentInfo.Name, out val);
         if (found)
-          field.SetValue(obj, mapper.GetObject(componentId));
+          field.SetValue(obj, val);
         else if (componentInfo.StorableAttribute.DefaultValue != null)
           field.SetValue(obj, componentInfo.StorableAttribute.DefaultValue);
@@ -88 +107 @@
       foreach (var componentInfo in typeInfo.Properties.Where(x => x.Writeable)) {
         var property = (PropertyInfo)componentInfo.MemberInfo;
-        uint componentId;
-        bool found = components.TryGetValue(mapper.GetStringId(componentInfo.Name), out componentId);
+        object val = null;
+        bool found = dict.TryGetValue(componentInfo.Name, out val);
         if (found)
-          property.SetValue(obj, mapper.GetObject(componentId), null);
+          property.SetValue(obj, val, null);
         else if (componentInfo.StorableAttribute.DefaultValue != null)
           property.SetValue(obj, componentInfo.StorableAttribute.DefaultValue, null);

branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Transformers/Transformers.cs

@@ -299 +299 @@
         box.TypeId = mapper.GetTypeId(type);
       }
+
+      if (StorableTypeAttribute.IsStorableType(type))
+        typeBox.Version = StorableTypeAttribute.GetStorableTypeAttribute(type).Version;
       box.SetExtension(TypeBox.Type, typeBox.Build());
     }