-DiscriminatedUnionConverter performance improvements
This commit is contained in:
@@ -23,6 +23,10 @@
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
using System.Diagnostics;
|
||||
using System.Reflection;
|
||||
using Microsoft.FSharp.Core;
|
||||
using Microsoft.FSharp.Reflection;
|
||||
#if !(NET35 || NET20 || NETFX_CORE || ASPNETCORE50)
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -83,6 +87,58 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
Assert.AreEqual(@"{""Case"":""AUD""}", json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SerializePerformance()
|
||||
{
|
||||
List<Shape> values = new List<Shape>
|
||||
{
|
||||
Shape.NewRectangle(10.0, 5.0),
|
||||
Shape.NewCircle(7.5)
|
||||
};
|
||||
|
||||
string json = JsonConvert.SerializeObject(values, Formatting.Indented);
|
||||
|
||||
Stopwatch ts = new Stopwatch();
|
||||
ts.Start();
|
||||
|
||||
for (int i = 0; i < 2000; i++)
|
||||
{
|
||||
JsonConvert.SerializeObject(values);
|
||||
}
|
||||
|
||||
ts.Stop();
|
||||
|
||||
Console.WriteLine(ts.Elapsed.TotalSeconds);
|
||||
Console.WriteLine(json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializePerformance()
|
||||
{
|
||||
string json = @"[
|
||||
{""Case"":""Rectangle"",""Fields"":[10.0,5.0]},
|
||||
{""Case"":""Rectangle"",""Fields"":[10.0,5.0]},
|
||||
{""Case"":""Rectangle"",""Fields"":[10.0,5.0]},
|
||||
{""Case"":""Rectangle"",""Fields"":[10.0,5.0]},
|
||||
{""Case"":""Rectangle"",""Fields"":[10.0,5.0]}
|
||||
]";
|
||||
|
||||
JsonConvert.DeserializeObject<List<Shape>>(json);
|
||||
|
||||
Stopwatch ts = new Stopwatch();
|
||||
ts.Start();
|
||||
|
||||
for (int i = 0; i < 2000; i++)
|
||||
{
|
||||
JsonConvert.DeserializeObject<List<Shape>>(json);
|
||||
}
|
||||
|
||||
ts.Stop();
|
||||
|
||||
Console.WriteLine(ts.Elapsed.TotalSeconds);
|
||||
Console.WriteLine(json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SerializeUnionWithFields()
|
||||
{
|
||||
@@ -116,6 +172,82 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
Assert.AreEqual(10.0, r.width);
|
||||
}
|
||||
|
||||
public class Union
|
||||
{
|
||||
public List<UnionCase> Cases;
|
||||
public Converter<object, int> TagReader { get; set; }
|
||||
}
|
||||
|
||||
public class UnionCase
|
||||
{
|
||||
public int Tag;
|
||||
public string Name;
|
||||
public PropertyInfo[] Fields;
|
||||
public Converter<object, object[]> FieldReader;
|
||||
public Converter<object[], object> Constructor;
|
||||
}
|
||||
|
||||
private Union CreateUnion(Type t)
|
||||
{
|
||||
Union u = new Union();
|
||||
|
||||
u.TagReader = FSharpFunc<object, int>.ToConverter(FSharpValue.PreComputeUnionTagReader(t, null));
|
||||
u.Cases = new List<UnionCase>();
|
||||
|
||||
UnionCaseInfo[] cases = FSharpType.GetUnionCases(t, null);
|
||||
|
||||
foreach (UnionCaseInfo unionCaseInfo in cases)
|
||||
{
|
||||
UnionCase unionCase = new UnionCase();
|
||||
unionCase.Tag = unionCaseInfo.Tag;
|
||||
unionCase.Name = unionCaseInfo.Name;
|
||||
unionCase.Fields = unionCaseInfo.GetFields();
|
||||
unionCase.FieldReader = FSharpFunc<object, object[]>.ToConverter(FSharpValue.PreComputeUnionReader(unionCaseInfo, null));
|
||||
unionCase.Constructor = FSharpFunc<object[], object>.ToConverter(FSharpValue.PreComputeUnionConstructor(unionCaseInfo, null));
|
||||
|
||||
u.Cases.Add(unionCase);
|
||||
}
|
||||
|
||||
return u;
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Serialize()
|
||||
{
|
||||
Shape value = Shape.NewRectangle(10.0, 5.0);
|
||||
|
||||
Union union = CreateUnion(value.GetType());
|
||||
|
||||
int tag = union.TagReader.Invoke(value);
|
||||
|
||||
UnionCase caseInfo = union.Cases.Single(c => c.Tag == tag);
|
||||
|
||||
object[] fields = caseInfo.FieldReader.Invoke(value);
|
||||
|
||||
foreach (object field in fields)
|
||||
{
|
||||
Console.WriteLine(field);
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Deserialize()
|
||||
{
|
||||
Union union = CreateUnion(typeof(Shape.Rectangle));
|
||||
|
||||
UnionCase caseInfo = union.Cases.Single(c => c.Name == "Rectangle");
|
||||
|
||||
Shape.Rectangle value = (Shape.Rectangle)caseInfo.Constructor.Invoke(new object[]
|
||||
{
|
||||
10.0, 5.0
|
||||
});
|
||||
|
||||
Console.WriteLine(value.ToString());
|
||||
|
||||
Console.WriteLine(value.width);
|
||||
Console.WriteLine(value.length);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeBasicUnion_NoMatch()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user