Changeset 6737 for branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs

Timestamp:

09/12/11 10:12:50 (13 years ago)

Author:

epitzer

Message:

#1530 Split type and serializer tokens and include special handling for CachedTypeSerializer (this should also fix #1527)

File:

• branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs (modified) (8 diffs)

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs

@@ -157 +157 @@
       AddTypeInfo(beginToken.TypeId, dict);
       return CreateNodeStart(XmlStringConstants.COMPOSITE, dict);
-
     }
 
@@ -164 +163 @@
         if (typeId == lastTypeToken.Id) {
           dict.Add("typeName", lastTypeToken.TypeName);
-          dict.Add("serializer", lastTypeToken.Serializer);
           lastTypeToken = null;
         } else {
           FlushTypeToken();
+        }
+      }
+      if (lastSerializerToken != null) {
+        if (typeId == lastSerializerToken.Id) {
+          dict.Add("serializer", lastSerializerToken.Serializer);
+          lastSerializerToken = null;
+        } else {
+          FlushSerializerToken();
         }
       }
@@ -238 +244 @@
 
     protected TypeToken lastTypeToken;
+    protected SerializerToken lastSerializerToken;
     /// <summary>
     /// Formats the specified token.
@@ -245 +252 @@
     protected override string Format(TypeToken token) {
       lastTypeToken = token;
+      return "";
+    }
+
+    protected override string Format(SerializerToken token) {
+      lastSerializerToken = token;
       return "";
     }
@@ -255 +267 @@
           new Dictionary<string, string> {
           {"id", lastTypeToken.Id.ToString()},
-          {"typeName", lastTypeToken.TypeName },
-          {"serializer", lastTypeToken.Serializer }});
+          {"typeName", lastTypeToken.TypeName }});
       } finally {
         lastTypeToken = null;
@@ -262 +273 @@
     }
 
+    protected string FlushSerializerToken() {
+      if (lastSerializerToken == null)
+        return "";
+      try {
+        return CreateNode(XmlStringConstants.SERIALIZER,
+          new Dictionary<string, string> {
+          {"id", lastSerializerToken.Id.ToString()},
+          {"serializer", lastSerializerToken.Serializer }});
+      } finally {
+        lastTypeToken = null;
+      }
+    }
+
     /// <summary>
     /// Formats the specified type cache.
@@ -267 +291 @@
     /// <param name="typeCache">The type cache.</param>
     /// <returns>An enumerable of formatted type cache tags.</returns>
-    public IEnumerable<string> Format(List<TypeMapping> typeCache) {
+    public IEnumerable<string> Format(TypeCache typeCache) {
       yield return CreateNodeStart(XmlStringConstants.TYPECACHE);
-      foreach (var mapping in typeCache)
-        yield return CreateNode(
-          XmlStringConstants.TYPE,
-          mapping.GetDict());
+      foreach (var type in typeCache.Types) {
+        int id = typeCache.GetOrCreateId(type);
+        var dict = new Dictionary<string, string> {
+          {"id", id.ToString()},
+          {"typeName", type.AssemblyQualifiedName},
+        };
+        Type serializer = typeCache.GetSerializer(id);
+        if (serializer != null)
+          dict.Add("serializer", serializer.AssemblyQualifiedName);
+        yield return CreateNode(XmlStringConstants.TYPE, dict); 
+      }
       yield return CreateNodeEnd(XmlStringConstants.TYPECACHE);
     }
@@ -342 +373 @@
             writer.Flush();
             if (includeAssemblies) {
-              foreach (string name in serializer.RequiredFiles) {
+              foreach (string name in serializer.GetRequiredFiles()) {
                 Uri uri = new Uri(name);
                 if (!uri.IsFile) {