Changeset 16553

Timestamp:

01/24/19 19:22:44 (5 years ago)

Author:

gkronber

Message:

#2520 for Hive serialization: added collection of serialized types and fall-back to old persistence format on deserialization. ITask must be a StorableType

Location:

branches/2520_PersistenceReintegration

Files:

• HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs (modified) (2 diffs)
• HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Hive/3.3/ITask.cs (modified) (1 diff)

branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs

@@ -24 +24 @@
 using System.IO;
 using HEAL.Fossil;
+using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Clients.Hive {
   public static class PersistenceUtil {
     public static byte[] Serialize(object obj, out IEnumerable<Type> types) {
-      using (MemoryStream memStream = new MemoryStream()) {
-        throw new NotImplementedException("Not supported by HEAL.Fossil yet."); // TODO
-        // XmlGenerator.Serialize(obj, memStream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types);
-        // byte[] jobByteArray = memStream.ToArray();
-        // return jobByteArray;
-      }
+      var ser = new ProtoBufSerializer();
+      return ser.Serialize(obj, out types);
     }
 
@@ -43 +40 @@
     public static T Deserialize<T>(byte[] sjob) {
       var ser = new ProtoBufSerializer();
-      return (T)ser.Deserialize(sjob);
+      try {
+        return (T)ser.Deserialize(sjob);
+      } catch (Exception) {
+        // retry with old persistence
+        using (MemoryStream memStream = new MemoryStream(sjob)) {
+          return XmlParser.Deserialize<T>(memStream);
+        }
+      }
     }
   }

branches/2520_PersistenceReintegration/HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj

@@ -89 +89 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
+    </Reference>
+    <Reference Include="HEAL.Fossil, Version=1.0.2.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\HEAL.Fossil.1.0.2-pre-02\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -98 +107 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
     <None Include="Plugin.cs.frame" />

branches/2520_PersistenceReintegration/HeuristicLab.Hive/3.3/ITask.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Hive {
+  [StorableType("197BB925-85AD-4DAE-A5F8-9EC33C07A0AF")]
   public interface ITask : IDeepCloneable, ICloneable {
     TimeSpan ExecutionTime { get; }