Changeset 17087

Timestamp:

07/05/19 14:56:37 (5 years ago)

Author:

abeham

Message:

#2520:

• fixed loading of samples, removed TODO (due to upgrade of Attic 1.2)
• corrected check when old persistence should be used to retry download from hive

Location:

trunk

Files:

• HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/StartPage.cs (modified) (2 diffs)

trunk/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

@@ -107 +107 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\Google.Protobuf.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

trunk/HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame

@@ -41 +41 @@
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Protobuf", "3.6.1")]
   public class HeuristicLabClientsHivePlugin : PluginBase {
   }

trunk/HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
+using Google.Protobuf;
 using HEAL.Attic;
 using HeuristicLab.Persistence.Default.Xml;
@@ -44 +46 @@
       try {
         return (T)ser.Deserialize(sjob);
-      } catch (Exception) {
-        // retry with old persistence
-        using (MemoryStream memStream = new MemoryStream(sjob)) {
-          return XmlParser.Deserialize<T>(memStream);
+      } catch (PersistenceException e) {
+        // Exceptions may arise because data in Hive was uploaded with former XML-based
+        // persistence or with Attic prior to 1.2.
+        if (e.InnerException is InvalidDataException) {
+          // We assume the data was serialized with HEAL.Attic < 1.2 which did not use
+          // DeflateStream, but as of 1.2 uses DeflateStream by default
+          var compressedData = Compress(sjob);
+          try {
+            // retry with the job's data compressed
+            return (T)ser.Deserialize(compressedData);
+          } catch (PersistenceException e2) {
+            if (e2.InnerException is InvalidProtocolBufferException
+              || e2.InnerException is InvalidDataException) {
+              // retry deserialize original bytes with old persistence
+              return DeserializeWithXmlParser<T>(sjob);
+            } else throw;
+          }
         }
+        if (e.InnerException is InvalidProtocolBufferException) {
+          // We assume the data was not serialized with HEAL.Attic, but with the former
+          // XML-based persistence
+          return DeserializeWithXmlParser<T>(sjob);
+        } else throw;
+      }
+    }
+
+    private static byte[] Compress(byte[] sjob) {
+      using (var memStream = new MemoryStream(sjob.Length)) {
+        using (var deflateStream = new DeflateStream(memStream, CompressionMode.Compress)) {
+          deflateStream.Write(sjob, 0, sjob.Length);
+        }
+        return memStream.ToArray();
+      }
+    }
+
+    private static T DeserializeWithXmlParser<T>(byte[] sjob) {
+      using (MemoryStream memStream = new MemoryStream(sjob)) {
+        return XmlParser.Deserialize<T>(memStream);
       }
     }

trunk/HeuristicLab.Optimizer/3.3/StartPage.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
 using System.Linq;
 using System.Reflection;
@@ -120 +119 @@
       using (var stream = assembly.GetManifestResourceStream(name)) {
         var serializer = new ProtoBufSerializer();
-        // TODO remove deflateStream with next release of HEAL.Attic
-        using (var deflateStream = new DeflateStream(stream, CompressionMode.Decompress, true)) {
-          var item = (NamedItem)serializer.Deserialize(deflateStream, false);
-          OnSampleLoaded(item, group, 1.0 / count);
-        }
+        var item = (NamedItem)serializer.Deserialize(stream, false);
+        OnSampleLoaded(item, group, 1.0 / count);
       }
     }