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

Improve JsonNode.DeepEquals numeric equality. #104255

Merged
merged 10 commits into from
Jul 8, 2024
+347 −2
Merged

Improve JsonNode.DeepEquals numeric equality. #104255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aaa3803
Attempt at improving JsonNode.DeepEquals numeric equality.
eiriktsarpalis Jul 1, 2024
73224d5
Implement arbitrary-precision decimal equality comparison.
eiriktsarpalis Jul 2, 2024
de5b311
Address feedback
eiriktsarpalis Jul 2, 2024
8d030ba
Add more comments.
eiriktsarpalis Jul 2, 2024
732882a
Update src/libraries/System.Text.Json/src/System/Text/Json/JsonHelper…
eiriktsarpalis Jul 2, 2024
b2d9b08
Address feedback
eiriktsarpalis Jul 2, 2024
e3efed1
Improve comments
eiriktsarpalis Jul 2, 2024
a6bc0f4
Update src/libraries/System.Text.Json/src/System/Text/Json/JsonHelper…
eiriktsarpalis Jul 2, 2024
65f3383
Trim frac trailing zeros before trimming leading zeros.
eiriktsarpalis Jul 2, 2024
007dd06
Add handling for exponent values > Int32
eiriktsarpalis Jul 4, 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
14 changes: 12 additions & 2 deletions src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Buffers.Text;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
Expand Down Expand Up @@ -1241,8 +1242,17 @@ internal static bool DeepEquals(JsonElement left, JsonElement right)
return true;

case JsonValueKind.Number:
// JSON numbers are equal if their raw representations are equal.
return left.GetRawValue().Span.SequenceEqual(right.GetRawValue().Span);
ReadOnlySpan<byte> leftRawValue = left.GetRawValue().Span;
ReadOnlySpan<byte> rightRawValue = right.GetRawValue().Span;

int bytesConsumed;
if (Utf8Parser.TryParse(leftRawValue, out decimal leftNumber, out bytesConsumed) && bytesConsumed == leftRawValue.Length &&
Utf8Parser.TryParse(rightRawValue, out decimal rightNumber, out bytesConsumed) && bytesConsumed == rightRawValue.Length)
{
return leftNumber == rightNumber;
}

return leftRawValue.SequenceEqual(rightRawValue);
eiriktsarpalis marked this conversation as resolved.
Show resolved Hide resolved

case JsonValueKind.String:
if (right.ValueIsEscaped)
Expand Down
14 changes: 14 additions & 0 deletions src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,20 @@ public static void DeepEqualsPrimitiveType()
JsonNodeTests.AssertNotDeepEqual(JsonValue.Create(10), JsonValue.Create("10"));
}

[Theory]
[InlineData("1", "1.0", true)]
[InlineData("-0.0", "0", true)]
[InlineData("-1.1e3", "-1100", true)]
[InlineData("79228162514264337593543950336", "792281625142643375935439503360e-1", false)] // Not equal since it exceeds decimal.MaxValue
[InlineData("1.75e+300", "1.75E+300", false)] // Not equal due to case difference in exponent
public static void DeepEqualsNumericType(string leftStr, string rightStr, bool areEqual)
{
JsonNode left = JsonNode.Parse(leftStr);
JsonNode right = JsonNode.Parse(rightStr);

Assert.Equal(areEqual, JsonNode.DeepEquals(left, right));
}

[Fact]
public static void DeepEqualsJsonElement()
{
Expand Down