Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix handling of large streams #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix handling of large streams #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions TupleAsJsonArray/Converters/TupleConverterBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,7 @@ public abstract class TupleConverterBase<TTuple> : JsonConverter<TTuple>
/// <param name="options">Existing Options</param>
protected void WriteValue<T>(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
{
var converter = (JsonConverter<T>)options.GetConverter(typeof(T));

if (converter == null)
{
JsonSerializer.Serialize(writer, value, options);
}
else
{
converter.Write(writer, value, options);
}
JsonSerializer.Serialize(writer, value, options);
}

/// <summary>
Expand All @@ -45,16 +36,7 @@ protected void WriteValue<T>(Utf8JsonWriter writer, T value, JsonSerializerOptio
/// <returns>Deserialized Value</returns>
protected T ReadValue<T>(ref Utf8JsonReader reader, JsonSerializerOptions options)
{
var converter = (JsonConverter<T>)options.GetConverter(typeof(T));

if (converter == null)
{
return JsonSerializer.Deserialize<T>(ref reader, options);
}
else
{
return converter.Read(ref reader, typeof(T), options);
}
return JsonSerializer.Deserialize<T>(ref reader, options);
}
}
}
13 changes: 8 additions & 5 deletions TupleJsonUnitTests/TupleJsonUnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
32 changes: 32 additions & 0 deletions TupleJsonUnitTests/UnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Threading.Tasks;
using TupleAsJsonArray;
using static TupleJsonUnitTests.TestHelper;

Expand Down Expand Up @@ -154,5 +157,34 @@ public void GinormousTuple()

Assert.AreEqual(valueTuple, valueTuple2);
}
#if NET6_0_OR_GREATER
[TestMethod]
public async Task ReadLargeStreamWithUnusualRecords()
{
var options = new JsonSerializerOptions();
options.Converters.Add(new TupleConverterFactory());

var biglist = new List<(Guid, DataRecord)>();

for (int i = 0; i < 100000; i++)
{
biglist.Add((Guid.NewGuid(), new DataRecord(new[] { "blah" })));
}

var memoryStream = new MemoryStream();

await JsonSerializer.SerializeAsync(memoryStream, biglist, options);
memoryStream.Position = 0;

await JsonSerializer.DeserializeAsync<List<(Guid, DataRecord)>>(memoryStream, options);
}

public record DataRecord(string[] Strings)
{
public string SomeInternalValue => "example";
}
#endif


}
}