-Optimized XML serialization memory usage for elements with one child element name

This commit is contained in:
James Newton-King
2017-01-16 11:09:11 +13:00
parent 473baa639b
commit 7e4b3448c7
@@ -1253,34 +1253,88 @@ namespace Newtonsoft.Json.Converters
private void SerializeGroupedNodes(JsonWriter writer, IXmlNode node, XmlNamespaceManager manager, bool writePropertyName) private void SerializeGroupedNodes(JsonWriter writer, IXmlNode node, XmlNamespaceManager manager, bool writePropertyName)
{ {
if (node.ChildNodes.Count == 0) switch (node.ChildNodes.Count)
{ {
return; case 0:
{
// nothing to serialize
break;
} }
case 1:
{
// avoid grouping when there is only one node
string nodeName = GetPropertyName(node.ChildNodes[0], manager);
WriteGroupedNodes(writer, manager, writePropertyName, node.ChildNodes, nodeName);
break;
}
default:
{
// check whether nodes have the same name
// if they don't then group into dictionary together by name
Dictionary<string, List<IXmlNode>> nodesGroupedByName = null;
// group nodes together by name string nodeName = null;
Dictionary<string, List<IXmlNode>> nodesGroupedByName = new Dictionary<string, List<IXmlNode>>();
for (int i = 0; i < node.ChildNodes.Count; i++) for (int i = 0; i < node.ChildNodes.Count; i++)
{ {
IXmlNode childNode = node.ChildNodes[i]; IXmlNode childNode = node.ChildNodes[i];
string nodeName = GetPropertyName(childNode, manager); string currentNodeName = GetPropertyName(childNode, manager);
if (nodesGroupedByName == null)
{
if (nodeName == null)
{
nodeName = currentNodeName;
}
else if (currentNodeName == nodeName)
{
// current node name matches others
}
else
{
nodesGroupedByName = new Dictionary<string, List<IXmlNode>>();
List<IXmlNode> nodes = new List<IXmlNode>(i);
for (int j = 0; j < i; j++)
{
nodes.Add(node.ChildNodes[j]);
}
nodesGroupedByName.Add(nodeName, nodes);
nodesGroupedByName.Add(currentNodeName, new List<IXmlNode> { childNode });
}
}
else
{
List<IXmlNode> nodes; List<IXmlNode> nodes;
if (!nodesGroupedByName.TryGetValue(nodeName, out nodes)) if (!nodesGroupedByName.TryGetValue(currentNodeName, out nodes))
{ {
nodes = new List<IXmlNode>(); nodes = new List<IXmlNode>();
nodesGroupedByName.Add(nodeName, nodes); nodesGroupedByName.Add(currentNodeName, nodes);
} }
nodes.Add(childNode); nodes.Add(childNode);
} }
}
if (nodesGroupedByName == null)
{
WriteGroupedNodes(writer, manager, writePropertyName, node.ChildNodes, nodeName);
}
else
{
// loop through grouped nodes. write single name instances as normal, // loop through grouped nodes. write single name instances as normal,
// write multiple names together in an array // write multiple names together in an array
foreach (KeyValuePair<string, List<IXmlNode>> nodeNameGroup in nodesGroupedByName) foreach (KeyValuePair<string, List<IXmlNode>> nodeNameGroup in nodesGroupedByName)
{ {
List<IXmlNode> groupedNodes = nodeNameGroup.Value; WriteGroupedNodes(writer, manager, writePropertyName, nodeNameGroup.Value, nodeNameGroup.Key);
}
}
break;
}
}
}
private void WriteGroupedNodes(JsonWriter writer, XmlNamespaceManager manager, bool writePropertyName, List<IXmlNode> groupedNodes, string elementNames)
{
bool writeArray; bool writeArray;
if (groupedNodes.Count == 1) if (groupedNodes.Count == 1)
@@ -1298,8 +1352,6 @@ namespace Newtonsoft.Json.Converters
} }
else else
{ {
string elementNames = nodeNameGroup.Key;
if (writePropertyName) if (writePropertyName)
{ {
writer.WritePropertyName(elementNames); writer.WritePropertyName(elementNames);
@@ -1315,7 +1367,6 @@ namespace Newtonsoft.Json.Converters
writer.WriteEndArray(); writer.WriteEndArray();
} }
} }
}
private void SerializeNode(JsonWriter writer, IXmlNode node, XmlNamespaceManager manager, bool writePropertyName) private void SerializeNode(JsonWriter writer, IXmlNode node, XmlNamespaceManager manager, bool writePropertyName)
{ {