Changeset 16480

Timestamp:

01/02/19 16:07:07 (6 years ago)

Author:

gkronber

Message:

#2520: use new persistence in ContentManager (with fallback), ClipBoard (with fallback), as well as for deep-cloning in Scripting and for Hive Persistence (without fallback & incomplete)

Location:

branches/2520_PersistenceReintegration

Files:

• HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/Clipboard.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/PersistenceContentManager.cs (modified) (1 diff)
• HeuristicLab.Scripting/3.3/VariableStore.cs (modified) (1 diff)

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.IO;
-using HeuristicLab.Persistence.Core;
-using HeuristicLab.Persistence.Default.Xml;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Clients.Hive {
@@ -30 +29 @@
     public static byte[] Serialize(object obj, out IEnumerable<Type> types) {
       using (MemoryStream memStream = new MemoryStream()) {
-        XmlGenerator.Serialize(obj, memStream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types);
-        byte[] jobByteArray = memStream.ToArray();
-        return jobByteArray;
+        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;
       }
     }
 
     public static byte[] Serialize(object obj) {
-      using (MemoryStream memStream = new MemoryStream()) {
-        XmlGenerator.Serialize(obj, memStream);
-        byte[] jobByteArray = memStream.ToArray();
-        return jobByteArray;
-      }
+      var ser = new ProtoBufSerializer();
+      return ser.Serialize(obj);
     }
 
     public static T Deserialize<T>(byte[] sjob) {
-      using (MemoryStream memStream = new MemoryStream(sjob)) {
-        T job = XmlParser.Deserialize<T>(memStream);
-        return job;
-      }
+      var ser = new ProtoBufSerializer();
+      return (T)ser.Deserialize(sjob);
     }
   }

branches/2520_PersistenceReintegration/HeuristicLab.Core.Views/3.3/Clipboard.cs

@@ -28 +28 @@
 using System.Threading;
 using System.Windows.Forms;
+using HEAL.Fossil;
 using HeuristicLab.Common;
 using HeuristicLab.MainForm;
@@ -156 +157 @@
       foreach (string filename in items) {
         try {
-          T item = XmlParser.Deserialize<T>(filename);
+          var ser = new ProtoBufSerializer();
+          T item = (T)ser.Deserialize(filename);
           OnItemLoaded(item, progressBar.Maximum / items.Length);
-        }
-        catch (Exception) { }
+        } catch (Exception) {
+          try {
+            // try old format if protobuf deserialization fails
+            T item = XmlParser.Deserialize<T>(filename);
+            OnItemLoaded(item, progressBar.Maximum / items.Length);
+          } catch (Exception) { }
+        }
       }
       OnAllItemsLoaded();
@@ -199 +206 @@
           i++;
           SetEnabledStateOfContentViews(item, false);
-          XmlGenerator.Serialize(item, ItemsPath + Path.DirectorySeparatorChar + i.ToString("00000000") + ".hl", CompressionLevel.Optimal);
+          var ser = new ProtoBufSerializer();
+          ser.Serialize(item, ItemsPath + Path.DirectorySeparatorChar + i.ToString("00000000") + ".hl");
           OnItemSaved(item, progressBar.Maximum / listView.Items.Count);
         }

branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/PersistenceContentManager.cs

@@ -32 +32 @@
 
     protected override IStorableContent LoadContent(string filename) {
-      return XmlParser.Deserialize<IStorableContent>(filename);
+      // first try to load using the new persistence format
+      try {
+        var ser = new ProtoBufSerializer();
+        return (IStorableContent)ser.Deserialize(filename);
+      } catch (PersistenceException e) {
+        // try old format if new format fails
+        return XmlParser.Deserialize<IStorableContent>(filename);
+      }
     }
 
     protected override void SaveContent(IStorableContent content, string filename, bool compressed, CancellationToken cancellationToken) {
-      XmlGenerator.Serialize(content, filename, compressed ? CompressionLevel.Optimal : CompressionLevel.NoCompression, cancellationToken);
+      // XmlGenerator.Serialize(content, filename, compressed ? CompressionLevel.Optimal : CompressionLevel.NoCompression, cancellationToken);
+      // store files with the new persistence format
+      var ser = new ProtoBufSerializer();
+      ser.Serialize(content, filename); // TODO: support cancellation
     }
   }

branches/2520_PersistenceReintegration/HeuristicLab.Scripting/3.3/VariableStore.cs

@@ -81 +81 @@
     protected T CloneByPersistence<T>(T value) {
       using (var serializerStream = new MemoryStream()) {
-        XmlGenerator.Serialize(value, serializerStream);
+        var serializer = new ProtoBufSerializer();
+        serializer.Serialize(value, serializerStream, disposeStream: false);
         var bytes = serializerStream.GetBuffer();
         using (var deserializerStream = new MemoryStream(bytes)) {
-          return XmlParser.Deserialize<T>(deserializerStream);
+          return (T)serializer.Deserialize(deserializerStream);
         }
       }