Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Performance improvements in JsonValue. #103733

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
merged 4 commits into from
Jun 20, 2024
Merged

Performance improvements in JsonValue. #103733

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
124e54c
Performance improvements in JsonValue.
eiriktsarpalis Jun 19, 2024
91c9d3c
Fix #103715.
eiriktsarpalis Jun 19, 2024
b59f3fc
Add more test cases and fix a number of bugs related to DeepEquals an…
eiriktsarpalis Jun 20, 2024
b7485ed
Fix number handling corner case.
eiriktsarpalis Jun 20, 2024
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
Fix #103715.
  • Loading branch information
@eiriktsarpalis
eiriktsarpalis committed Jun 19, 2024
commit 91c9d3ce86ae0732aebe12aa91175fe72a2a2155
25 changes: 23 additions & 2 deletions src/libraries/System.Text.Json/src/System/Text/Json/Nodes/JsonObject.IDictionary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ public partial class JsonObject : IDictionary<string, JsonNode?>
/// </exception>
public void Add(string propertyName, JsonNode? value)
{
if (propertyName is null)
{
ThrowHelper.ThrowArgumentNullException(nameof(propertyName));
}

Dictionary.Add(propertyName, value);
value?.AssignParent(this);
}
Expand Down Expand Up @@ -74,7 +79,15 @@ public void Clear()
/// <exception cref="ArgumentNullException">
/// <paramref name="propertyName"/> is <see langword="null"/>.
/// </exception>
public bool ContainsKey(string propertyName) => Dictionary.ContainsKey(propertyName);
public bool ContainsKey(string propertyName)
{
if (propertyName is null)
{
ThrowHelper.ThrowArgumentNullException(nameof(propertyName));
}

return Dictionary.ContainsKey(propertyName);
}

/// <summary>
/// Gets the number of elements contained in <see cref="JsonObject"/>.
Expand Down Expand Up @@ -180,7 +193,15 @@ public bool Remove(string propertyName)
/// <exception cref="ArgumentNullException">
/// <paramref name="propertyName"/> is <see langword="null"/>.
/// </exception>
bool IDictionary<string, JsonNode?>.TryGetValue(string propertyName, out JsonNode? jsonNode) => Dictionary.TryGetValue(propertyName, out jsonNode);
bool IDictionary<string, JsonNode?>.TryGetValue(string propertyName, out JsonNode? jsonNode)
{
if (propertyName is null)
{
ThrowHelper.ThrowArgumentNullException(nameof(propertyName));
}

return Dictionary.TryGetValue(propertyName, out jsonNode);
}

/// <summary>
/// Returns <see langword="false"/>.
Expand Down
20 changes: 19 additions & 1 deletion src/libraries/System.Text.Json/src/System/Text/Json/Nodes/JsonObject.IList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ public partial class JsonObject : IList<KeyValuePair<string, JsonNode?>>
/// <exception cref="InvalidOperationException"><paramref name="value"/> already has a parent.</exception>
public void SetAt(int index, string propertyName, JsonNode? value)
{
if (propertyName is null)
{
ThrowHelper.ThrowArgumentNullException(nameof(propertyName));
}

OrderedDictionary<string, JsonNode?> dictionary = Dictionary;
KeyValuePair<string, JsonNode?> existing = dictionary.GetAt(index);
dictionary.SetAt(index, propertyName, value);
Expand All @@ -48,7 +53,15 @@ public void SetAt(int index, JsonNode? value)
/// <param name="propertyName">The property name to locate.</param>
/// <returns>The index of <paramref name="propertyName"/> if found; otherwise, -1.</returns>
/// <exception cref="ArgumentNullException"><paramref name="propertyName"/> is null.</exception>
public int IndexOf(string propertyName) => Dictionary.IndexOf(propertyName);
public int IndexOf(string propertyName)
{
if (propertyName is null)
{
ThrowHelper.ThrowArgumentNullException(nameof(propertyName));
}

return Dictionary.IndexOf(propertyName);
}

/// <summary>Inserts a property into the object at the specified index.</summary>
/// <param name="index">The zero-based index at which the property should be inserted.</param>
Expand All @@ -59,6 +72,11 @@ public void SetAt(int index, JsonNode? value)
/// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than 0 or greater than <see cref="Count"/>.</exception>
public void Insert(int index, string propertyName, JsonNode? value)
{
if (propertyName is null)
{
ThrowHelper.ThrowArgumentNullException(nameof(propertyName));
}

Dictionary.Insert(index, propertyName, value);
value?.AssignParent(this);
}
Expand Down
11 changes: 9 additions & 2 deletions src/libraries/System.Text.Json/src/System/Text/Json/Nodes/JsonObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,15 @@ internal string GetPropertyName(JsonNode? node)
/// <returns>
/// <see langword="true"/> if a property with the specified name was found; otherwise, <see langword="false"/>.
/// </returns>
public bool TryGetPropertyValue(string propertyName, out JsonNode? jsonNode) =>
Dictionary.TryGetValue(propertyName, out jsonNode);
public bool TryGetPropertyValue(string propertyName, out JsonNode? jsonNode)
{
if (propertyName is null)
{
ThrowHelper.ThrowArgumentNullException(nameof(propertyName));
}

return Dictionary.TryGetValue(propertyName, out jsonNode);
}

/// <inheritdoc/>
public override void WriteTo(Utf8JsonWriter writer, JsonSerializerOptions? options = null)
Expand Down