Changeset 3005 for trunk/sources/HeuristicLab.Persistence/3.3/Core/DeSerializer.cs

Timestamp:

03/11/10 15:50:50 (14 years ago)

Author:

epitzer

Message:

add support for type information interleaving and subsequently true streaming (#548)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Core/DeSerializer.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Core/DeSerializer.cs

@@ -77 +77 @@
       parentStack = new Stack<Midwife>();
       typeIds = new Dictionary<int, Type>();
-      serializerMapping = CreateSerializers(typeCache);
-    }
-
-    private Dictionary<Type, object> CreateSerializers(IEnumerable<TypeMapping> typeCache) {
-      Dictionary<Type, object> serializerInstances = new Dictionary<Type, object>();
+      serializerMapping = new Dictionary<Type, object>();
+      foreach (var typeMapping in typeCache) {
+        AddTypeInfo(typeMapping);
+      }
+    }
+
+    private Dictionary<Type, object> serializerInstances = new Dictionary<Type, object>();    
+
+    public void AddTypeInfo(TypeMapping typeMapping) {
+      if (typeIds.ContainsKey(typeMapping.Id))
+        return;
       try {
-        var map = new Dictionary<Type, object>();
-        foreach (var typeMapping in typeCache) {
-          Type type = TypeLoader.Load(typeMapping.TypeName);
-          typeIds.Add(typeMapping.Id, type);
-          Type serializerType = TypeLoader.Load(typeMapping.Serializer);
-          object serializer;
-          if (serializerInstances.ContainsKey(serializerType))
-            serializer = serializerInstances[serializerType];
-          else
-            serializer = Activator.CreateInstance(serializerType, true);
-          map.Add(type, serializer);
-        }
-        return map;
+        Type type = TypeLoader.Load(typeMapping.TypeName);
+        typeIds.Add(typeMapping.Id, type);
+        Type serializerType = TypeLoader.Load(typeMapping.Serializer);
+        object serializer;
+        if (serializerInstances.ContainsKey(serializerType))
+          serializer = serializerInstances[serializerType];
+        else
+          serializer = Activator.CreateInstance(serializerType, true);
+        serializerMapping.Add(type, serializer);
       } catch (PersistenceException) {
         throw;
       } catch (Exception e) {
-        throw new PersistenceException(
-          "The serialization type cache could not be loaded.\r\n" +
-          "This usualy happens when you are missing an Assembly or Plugin.", e);
+        throw new PersistenceException(string.Format(
+          "Could not add type info for {0} ({1})",
+          typeMapping.TypeName, typeMapping.Serializer), e);
       }
     }
@@ -125 +127 @@
         } else if (t == typeof(MetaInfoEndToken)) {
           MetaInfoEnd((MetaInfoEndToken)token);
+        } else if (t == typeof(TypeToken)) {
+          Type((TypeToken)token);
         } else {
           throw new PersistenceException("invalid token type");
@@ -138 +142 @@
       if (!m.MetaMode && m.Obj == null)
         CreateInstance(m);
+    }
+
+    private void Type(TypeToken token) {
+      AddTypeInfo(new TypeMapping(token.Id, token.TypeName, token.Serializer));
     }