Skip to content

Refactor root-level serialization logic and polymorphic value handling. #72789

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

Merged
eiriktsarpalis merged 8 commits into from
Jul 29, 2022
Merged

Refactor root-level serialization logic and polymorphic value handling. #72789

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9fc8fee
Refactor root-level serialization logic and polymorphic value handling.
eiriktsarpalis Jul 25, 2022
063905e
Address feedback
eiriktsarpalis Jul 26, 2022
ba67f82
Do not consult metadata LRU cache in JsonResumableConverter bridging …
eiriktsarpalis Jul 28, 2022
57d92e9
Use secondary LRU cache when resolving root-level polymorphic types.
eiriktsarpalis Jul 28, 2022
304e25d
Add test coverage for root-level polymorphic values in JsonTypeInfo<T…
eiriktsarpalis Jul 29, 2022
97a8b7a
Change caching strategy for root-level polymorphic values.
eiriktsarpalis Jul 29, 2022
953629a
Update src/libraries/System.Text.Json/src/System/Text/Json/Serializat…
eiriktsarpalis Jul 29, 2022
2b74e92
Remove commented out code
eiriktsarpalis Jul 29, 2022
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
Prev Previous commit
Next Next commit
Do not consult metadata LRU cache in JsonResumableConverter bridging … 
…logic.
  • Loading branch information
@eiriktsarpalis
eiriktsarpalis committed Jul 29, 2022
commit ba67f821e93f6d31876fdad59e2c01e8b0b6e5bf
4 changes: 3 additions & 1 deletion ...ibraries/System.Text.Json/src/System/Text/Json/Serialization/JsonResumableConverterOfT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ internal abstract class JsonResumableConverter<T> : JsonConverter<T>
// Bridge from resumable to value converters.

ReadStack state = default;
state.Initialize(typeToConvert, options, supportContinuation: false);
JsonTypeInfo jsonTypeInfo = options.GetTypeInfoInternal(typeToConvert);
state.Initialize(jsonTypeInfo);

TryRead(ref reader, typeToConvert, options, ref state, out T? value);
return value;
}
Expand Down
23 changes: 17 additions & 6 deletions ...braries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializer.Read.Stream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,13 @@ private static async IAsyncEnumerable<TValue> CreateAsyncEnumerableDeserializer<
Debug.Assert(queueTypeInfo.IsConfigured);
JsonSerializerOptions options = queueTypeInfo.Options;
var bufferState = new ReadBufferState(options.DefaultBufferSize);
ReadStack readStack = default;
readStack.Initialize(queueTypeInfo, supportContinuation: true);
ReadStack readStack = new ReadStack
{
SupportContinuation = true
};

readStack.Initialize(queueTypeInfo);

var jsonReaderState = new JsonReaderState(options.GetReaderOptions());

try
Expand Down Expand Up @@ -470,8 +475,11 @@ private static async IAsyncEnumerable<TValue> CreateAsyncEnumerableDeserializer<
Debug.Assert(jsonTypeInfo.IsConfigured);
JsonSerializerOptions options = jsonTypeInfo.Options;
var bufferState = new ReadBufferState(options.DefaultBufferSize);
ReadStack readStack = default;
readStack.Initialize(jsonTypeInfo, supportContinuation: true);
ReadStack readStack = new ReadStack
{
SupportContinuation = true
};
readStack.Initialize(jsonTypeInfo);
var jsonReaderState = new JsonReaderState(options.GetReaderOptions());

try
Expand Down Expand Up @@ -500,8 +508,11 @@ private static async IAsyncEnumerable<TValue> CreateAsyncEnumerableDeserializer<
Debug.Assert(jsonTypeInfo.IsConfigured);
JsonSerializerOptions options = jsonTypeInfo.Options;
var bufferState = new ReadBufferState(options.DefaultBufferSize);
ReadStack readStack = default;
readStack.Initialize(jsonTypeInfo, supportContinuation: true);
ReadStack readStack = new ReadStack
{
SupportContinuation = true
};
readStack.Initialize(jsonTypeInfo);
var jsonReaderState = new JsonReaderState(options.GetReaderOptions());

try
Expand Down
9 changes: 1 addition & 8 deletions src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReadStack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,7 @@ private void EnsurePushCapacity()
}
}

public void Initialize(Type type, JsonSerializerOptions options, bool supportContinuation)
{
JsonTypeInfo jsonTypeInfo = options.GetTypeInfoForRootType(type);
Initialize(jsonTypeInfo, supportContinuation);
}

internal void Initialize(JsonTypeInfo jsonTypeInfo, bool supportContinuation = false)
internal void Initialize(JsonTypeInfo jsonTypeInfo)
{
JsonSerializerOptions options = jsonTypeInfo.Options;
if (options.ReferenceHandlingStrategy == ReferenceHandlingStrategy.Preserve)
Expand All @@ -108,7 +102,6 @@ internal void Initialize(JsonTypeInfo jsonTypeInfo, bool supportContinuation = f
PreserveReferences = true;
}

SupportContinuation = supportContinuation;
Current.JsonTypeInfo = jsonTypeInfo;
Current.JsonPropertyInfo = jsonTypeInfo.PropertyInfoForTypeInfo;
Current.NumberHandling = Current.JsonPropertyInfo.EffectiveNumberHandling;
Expand Down