Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 283
PERF: Reduce boxing allocations in GetScalarValue#2938
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.
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
Open
Youssef Fahmy (Youssef1313)
wants to merge
5
commits into
microsoft:mainChoose a base branch
from
Youssef1313:dev/ygerges/perf
base:main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Uh oh!
There was an error while loading. Please reload this page.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
73d9648
PERF: Reduce boxing allocations in GetScalarValue
Youssef1313 9bdea50
Reduce unnecessary allocations in JSON parsing
Youssef1313 9e7ad1c
Simplify
Youssef1313 512cd81
Avoid unnecessary ToDictionary
Youssef1313 f120c66
chore: typo fix
baywet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,11 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT license. | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Globalization; | ||
| using System.Linq; | ||
| using System.Text.Json; | ||
| using System.Text.Json.Nodes; | ||
| namespace Microsoft.OpenApi.Reader | ||
| @@ -159,9 +160,47 @@ public static Dictionary<string, HashSet<T>> CreateArrayMap<T>(this JsonNode? no | ||
| { | ||
| var scalarNode = node is JsonValue value ? value : throw new OpenApiException("Expected scalar value."); | ||
| // It's much more efficient to call scalarNode.TryGetValue<string> than to call scalarNode.GetValue<object>() and then convert to string. | ||
| // When asking for "object" type, if scalarNode is JsonValueOfElement (internal type in STJ), we will get back | ||
| // a boxed JsonElement (paying the cost of unnecessary boxing allocation), and we then call JsonElement.ToString. | ||
| // So, we first check if we can get the string value directly, and only if that fails, we fallback to the expensive code. | ||
| if (scalarNode.TryGetValue<string>(out var stringValue)) | ||
| { | ||
| return stringValue; | ||
| } | ||
| return Convert.ToString(scalarNode.GetValue<object>(), CultureInfo.InvariantCulture); | ||
| } | ||
| public static bool GetScalarBoolValue(this JsonNode? node) | ||
| { | ||
| var scalarNode = node is JsonValue value ? value : throw new OpenApiException("Expected scalar value."); | ||
| return scalarNode.GetValue<bool>(); | ||
| } | ||
| public static int GetScalarIntValue(this JsonNode? node) | ||
| { | ||
| var scalarNode = node is JsonValue value && value.GetValueKind() == JsonValueKind.Number ? value : throw new OpenApiException("Expected numeric scalar value."); | ||
Youssef1313 marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| if (scalarNode.TryGetValue<int>(out var intValue)) | ||
| { | ||
| return intValue; | ||
| } | ||
| return Convert.ToInt32(scalarNode.GetValue<object>()); | ||
| } | ||
| public static uint GetScalarUIntValue(this JsonNode? node) | ||
| { | ||
| var scalarNode = node is JsonValue value && value.GetValueKind() == JsonValueKind.Number ? value : throw new OpenApiException("Expected numeric scalar value."); | ||
| if (scalarNode.TryGetValue<uint>(out var uintValue)) | ||
| { | ||
| return uintValue; | ||
| } | ||
| return Convert.ToUInt32(scalarNode.GetValue<object>()); | ||
| } | ||
| public static string? GetReferencePointer(this JsonObject jsonObject) | ||
| { | ||
| return jsonObject.TryGetPropertyValue("$ref", out var refNode) ? refNode?.GetScalarValue() : null; | ||
40 changes: 10 additions & 30 deletions
40 src/Microsoft.OpenApi/Reader/V2/OpenApiHeaderDeserializer.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 2 additions & 6 deletions
8 src/Microsoft.OpenApi/Reader/V2/OpenApiOperationDeserializer.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 7 additions & 31 deletions
38 src/Microsoft.OpenApi/Reader/V2/OpenApiParameterDeserializer.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 12 additions & 44 deletions
56 src/Microsoft.OpenApi/Reader/V2/OpenApiSchemaDeserializer.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that one reason why we had to do that was to avoid mangling like default, numbers with formats, etc... While I do appreciate the performance improvements, I don't want it to come at the price of a regression.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TryGetValue<string>is never going to throw or do something strange. It will return true if the node really represents a string. For example, if you have any numbers in JSON like"maximum": 10,TryGetValue<string>will return false because the node doesn't represent a string. And then we fallback to the original implementation.I done it this way explicitly because I saw that some numerics are read raw as strings that way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is what I'm referring to c17a87e
I think the object convert was introduced to avoid formatting issues for defaults and other properties when using types like dates and such.