-Improved deserialization performance by only tracking property presence when needed
This commit is contained in:
@@ -727,7 +727,7 @@ now brown cow?", '"', true);
|
|||||||
{
|
{
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
int depth = 700;
|
int depth = 900;
|
||||||
for (int i = 0; i < depth; i++)
|
for (int i = 0; i < depth; i++)
|
||||||
{
|
{
|
||||||
sb.Append("{'A':");
|
sb.Append("{'A':");
|
||||||
|
|||||||
@@ -72,6 +72,36 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
/// <value>The parametrized constructor.</value>
|
/// <value>The parametrized constructor.</value>
|
||||||
public ConstructorInfo ParametrizedConstructor { get; set; }
|
public ConstructorInfo ParametrizedConstructor { get; set; }
|
||||||
|
|
||||||
|
private bool? _hasRequiredOrDefaultValueProperties;
|
||||||
|
internal bool HasRequiredOrDefaultValueProperties
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (_hasRequiredOrDefaultValueProperties == null)
|
||||||
|
{
|
||||||
|
_hasRequiredOrDefaultValueProperties = false;
|
||||||
|
|
||||||
|
if (ItemRequired.GetValueOrDefault(Required.Default) != Required.Default)
|
||||||
|
{
|
||||||
|
_hasRequiredOrDefaultValueProperties = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
foreach (JsonProperty property in Properties)
|
||||||
|
{
|
||||||
|
if (property.Required != Required.Default || ((property.DefaultValueHandling & DefaultValueHandling.Populate) == DefaultValueHandling.Populate) && property.Writable)
|
||||||
|
{
|
||||||
|
_hasRequiredOrDefaultValueProperties = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return _hasRequiredOrDefaultValueProperties.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="JsonObjectContract"/> class.
|
/// Initializes a new instance of the <see cref="JsonObjectContract"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
if (contract.ContractType == JsonContractType.Dictionary)
|
if (contract.ContractType == JsonContractType.Dictionary)
|
||||||
PopulateDictionary(CollectionUtils.CreateDictionaryWrapper(target), reader, (JsonDictionaryContract) contract, null, null, id);
|
PopulateDictionary(CollectionUtils.CreateDictionaryWrapper(target), reader, (JsonDictionaryContract) contract, null, null, id);
|
||||||
else if (contract.ContractType == JsonContractType.Object)
|
else if (contract.ContractType == JsonContractType.Object)
|
||||||
PopulateObject(target, reader, (JsonObjectContract) contract, null, null, id);
|
PopulateObject(target, reader, (JsonObjectContract) contract, null, id);
|
||||||
else
|
else
|
||||||
throw JsonSerializationException.Create(reader, "Cannot populate JSON object onto type '{0}'.".FormatWith(CultureInfo.InvariantCulture, objectType));
|
throw JsonSerializationException.Create(reader, "Cannot populate JSON object onto type '{0}'.".FormatWith(CultureInfo.InvariantCulture, objectType));
|
||||||
}
|
}
|
||||||
@@ -317,7 +317,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
else
|
else
|
||||||
targetObject = CreateNewObject(reader, objectContract, member, containerMember, id);
|
targetObject = CreateNewObject(reader, objectContract, member, containerMember, id);
|
||||||
|
|
||||||
return PopulateObject(targetObject, reader, objectContract, member, containerMember, id);
|
return PopulateObject(targetObject, reader, objectContract, member, id);
|
||||||
case JsonContractType.Primitive:
|
case JsonContractType.Primitive:
|
||||||
JsonPrimitiveContract primitiveContract = (JsonPrimitiveContract) contract;
|
JsonPrimitiveContract primitiveContract = (JsonPrimitiveContract) contract;
|
||||||
// if the content is inside $value then read past it
|
// if the content is inside $value then read past it
|
||||||
@@ -1245,12 +1245,14 @@ To fix this error either change the environment to be fully trusted, change the
|
|||||||
return newObject;
|
return newObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
private object PopulateObject(object newObject, JsonReader reader, JsonObjectContract contract, JsonProperty member, JsonProperty containerProperty, string id)
|
private object PopulateObject(object newObject, JsonReader reader, JsonObjectContract contract, JsonProperty member, string id)
|
||||||
{
|
{
|
||||||
contract.InvokeOnDeserializing(newObject, Serializer.Context);
|
contract.InvokeOnDeserializing(newObject, Serializer.Context);
|
||||||
|
|
||||||
Dictionary<JsonProperty, PropertyPresence> propertiesPresence =
|
// only need to keep a track of properies presence if they are required or a value should be defaulted if missing
|
||||||
contract.Properties.ToDictionary(m => m, m => PropertyPresence.None);
|
Dictionary<JsonProperty, PropertyPresence> propertiesPresence = (contract.HasRequiredOrDefaultValueProperties || HasFlag(Serializer.DefaultValueHandling, DefaultValueHandling.Populate))
|
||||||
|
? contract.Properties.ToDictionary(m => m, m => PropertyPresence.None)
|
||||||
|
: null;
|
||||||
|
|
||||||
if (id != null)
|
if (id != null)
|
||||||
Serializer.ReferenceResolver.AddReference(this, id, newObject);
|
Serializer.ReferenceResolver.AddReference(this, id, newObject);
|
||||||
@@ -1302,6 +1304,26 @@ To fix this error either change the environment to be fully trusted, change the
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case JsonToken.EndObject:
|
case JsonToken.EndObject:
|
||||||
|
{
|
||||||
|
EndObject(newObject, reader, contract, initialDepth, propertiesPresence);
|
||||||
|
|
||||||
|
contract.InvokeOnDeserialized(newObject, Serializer.Context);
|
||||||
|
return newObject;
|
||||||
|
}
|
||||||
|
case JsonToken.Comment:
|
||||||
|
// ignore
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw JsonSerializationException.Create(reader, "Unexpected token when deserializing object: " + reader.TokenType);
|
||||||
|
}
|
||||||
|
} while (reader.Read());
|
||||||
|
|
||||||
|
throw JsonSerializationException.Create(reader, "Unexpected end when deserializing object.");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void EndObject(object newObject, JsonReader reader, JsonObjectContract contract, int initialDepth, Dictionary<JsonProperty, PropertyPresence> propertiesPresence)
|
||||||
|
{
|
||||||
|
if (propertiesPresence != null)
|
||||||
{
|
{
|
||||||
foreach (KeyValuePair<JsonProperty, PropertyPresence> propertyPresence in propertiesPresence)
|
foreach (KeyValuePair<JsonProperty, PropertyPresence> propertyPresence in propertiesPresence)
|
||||||
{
|
{
|
||||||
@@ -1323,8 +1345,7 @@ To fix this error either change the environment to be fully trusted, change the
|
|||||||
if (property.PropertyContract == null)
|
if (property.PropertyContract == null)
|
||||||
property.PropertyContract = GetContractSafe(property.PropertyType);
|
property.PropertyContract = GetContractSafe(property.PropertyType);
|
||||||
|
|
||||||
if (HasFlag(property.DefaultValueHandling.GetValueOrDefault(Serializer.DefaultValueHandling), DefaultValueHandling.Populate)
|
if (HasFlag(property.DefaultValueHandling.GetValueOrDefault(Serializer.DefaultValueHandling), DefaultValueHandling.Populate) && property.Writable)
|
||||||
&& property.Writable)
|
|
||||||
property.ValueProvider.SetValue(newObject, EnsureType(reader, property.DefaultValue, CultureInfo.InvariantCulture, property.PropertyContract, property.PropertyType));
|
property.ValueProvider.SetValue(newObject, EnsureType(reader, property.DefaultValue, CultureInfo.InvariantCulture, property.PropertyContract, property.PropertyType));
|
||||||
break;
|
break;
|
||||||
case PropertyPresence.Null:
|
case PropertyPresence.Null:
|
||||||
@@ -1342,24 +1363,12 @@ To fix this error either change the environment to be fully trusted, change the
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
contract.InvokeOnDeserialized(newObject, Serializer.Context);
|
|
||||||
return newObject;
|
|
||||||
}
|
}
|
||||||
case JsonToken.Comment:
|
|
||||||
// ignore
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
throw JsonSerializationException.Create(reader, "Unexpected token when deserializing object: " + reader.TokenType);
|
|
||||||
}
|
|
||||||
} while (reader.Read());
|
|
||||||
|
|
||||||
throw JsonSerializationException.Create(reader, "Unexpected end when deserializing object.");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetPropertyPresence(JsonReader reader, JsonProperty property, Dictionary<JsonProperty, PropertyPresence> requiredProperties)
|
private void SetPropertyPresence(JsonReader reader, JsonProperty property, Dictionary<JsonProperty, PropertyPresence> requiredProperties)
|
||||||
{
|
{
|
||||||
if (property != null)
|
if (property != null && requiredProperties != null)
|
||||||
{
|
{
|
||||||
requiredProperties[property] = (reader.TokenType == JsonToken.Null || reader.TokenType == JsonToken.Undefined)
|
requiredProperties[property] = (reader.TokenType == JsonToken.Null || reader.TokenType == JsonToken.Undefined)
|
||||||
? PropertyPresence.Null
|
? PropertyPresence.Null
|
||||||
|
|||||||
Reference in New Issue
Block a user