Skip to content

Unify the JsonDocument and Utf8JsonReader handling of DateTime/Offset #113929

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 2 commits into from
Jun 3, 2025
Merged

Unify the JsonDocument and Utf8JsonReader handling of DateTime/Offset #113929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a2f86a
Unify the JsonDocument and Utf8JsonReader handling of DateTime/Offset
IDisposable Mar 26, 2025
3ba3649
Merge branch 'main' into unify-json-date-parsing
PranavSenthilnathan May 27, 2025
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
46 changes: 2 additions & 44 deletions src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,28 +666,7 @@ internal bool TryGetValue(int index, out DateTime value)
ReadOnlySpan<byte> data = _utf8Json.Span;
ReadOnlySpan<byte> segment = data.Slice(row.Location, row.SizeOrLength);

if (!JsonHelpers.IsValidDateTimeOffsetParseLength(segment.Length))
{
value = default;
return false;
}

// Segment needs to be unescaped
if (row.HasComplexChildren)
{
return JsonReaderHelper.TryGetEscapedDateTime(segment, out value);
}

Debug.Assert(segment.IndexOf(JsonConstants.BackSlash) == -1);

if (JsonHelpers.TryParseAsISO(segment, out DateTime tmp))
{
value = tmp;
return true;
}

value = default;
return false;
return JsonReaderHelper.TryGetValue(segment, row.HasComplexChildren, out value);
}

internal bool TryGetValue(int index, out DateTimeOffset value)
Expand All @@ -701,28 +680,7 @@ internal bool TryGetValue(int index, out DateTimeOffset value)
ReadOnlySpan<byte> data = _utf8Json.Span;
ReadOnlySpan<byte> segment = data.Slice(row.Location, row.SizeOrLength);

if (!JsonHelpers.IsValidDateTimeOffsetParseLength(segment.Length))
{
value = default;
return false;
}

// Segment needs to be unescaped
if (row.HasComplexChildren)
{
return JsonReaderHelper.TryGetEscapedDateTimeOffset(segment, out value);
}

Debug.Assert(segment.IndexOf(JsonConstants.BackSlash) == -1);

if (JsonHelpers.TryParseAsISO(segment, out DateTimeOffset tmp))
{
value = tmp;
return true;
}

value = default;
return false;
return JsonReaderHelper.TryGetValue(segment, row.HasComplexChildren, out value);
}

internal bool TryGetValue(int index, out Guid value)
Expand Down
52 changes: 52 additions & 0 deletions src/libraries/System.Text.Json/src/System/Text/Json/Reader/JsonReaderHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,32 @@ public static bool IsTokenTypePrimitive(JsonTokenType tokenType) =>
// Otherwise, return false.
public static bool IsHexDigit(byte nextByte) => HexConverter.IsHexChar(nextByte);

public static bool TryGetValue(ReadOnlySpan<byte> segment, bool isEscaped, out DateTime value)
{
if (!JsonHelpers.IsValidDateTimeOffsetParseLength(segment.Length))
{
value = default;
return false;
}

// Segment needs to be unescaped
if (isEscaped)
{
return TryGetEscapedDateTime(segment, out value);
}

Debug.Assert(segment.IndexOf(JsonConstants.BackSlash) == -1);

if (JsonHelpers.TryParseAsISO(segment, out DateTime tmp))
{
value = tmp;
return true;
}

value = default;
return false;
}

public static bool TryGetEscapedDateTime(ReadOnlySpan<byte> source, out DateTime value)
{
Debug.Assert(source.Length <= JsonConstants.MaximumEscapedDateTimeOffsetParseLength);
Expand All @@ -101,6 +127,32 @@ public static bool TryGetEscapedDateTime(ReadOnlySpan<byte> source, out DateTime
return false;
}

public static bool TryGetValue(ReadOnlySpan<byte> segment, bool isEscaped, out DateTimeOffset value)
{
if (!JsonHelpers.IsValidDateTimeOffsetParseLength(segment.Length))
{
value = default;
return false;
}

// Segment needs to be unescaped
if (isEscaped)
{
return TryGetEscapedDateTimeOffset(segment, out value);
}

Debug.Assert(segment.IndexOf(JsonConstants.BackSlash) == -1);

if (JsonHelpers.TryParseAsISO(segment, out DateTimeOffset tmp))
{
value = tmp;
return true;
}

value = default;
return false;
}

public static bool TryGetEscapedDateTimeOffset(ReadOnlySpan<byte> source, out DateTimeOffset value)
{
Debug.Assert(source.Length <= JsonConstants.MaximumEscapedDateTimeOffsetParseLength);
Expand Down
44 changes: 2 additions & 42 deletions src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.TryGet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,30 +1260,10 @@ internal bool TryGetDateTimeCore(out DateTime value)
}
else
{
if (!JsonHelpers.IsInRangeInclusive(ValueSpan.Length, JsonConstants.MinimumDateTimeParseLength, JsonConstants.MaximumEscapedDateTimeOffsetParseLength))
{
value = default;
return false;
}

span = ValueSpan;
}

if (ValueIsEscaped)
{
return JsonReaderHelper.TryGetEscapedDateTime(span, out value);
}

Debug.Assert(span.IndexOf(JsonConstants.BackSlash) == -1);

if (JsonHelpers.TryParseAsISO(span, out DateTime tmp))
{
value = tmp;
return true;
}

value = default;
return false;
return JsonReaderHelper.TryGetValue(span, ValueIsEscaped, out value);
}

/// <summary>
Expand Down Expand Up @@ -1325,30 +1305,10 @@ internal bool TryGetDateTimeOffsetCore(out DateTimeOffset value)
}
else
{
if (!JsonHelpers.IsInRangeInclusive(ValueSpan.Length, JsonConstants.MinimumDateTimeParseLength, JsonConstants.MaximumEscapedDateTimeOffsetParseLength))
{
value = default;
return false;
}

span = ValueSpan;
}

if (ValueIsEscaped)
{
return JsonReaderHelper.TryGetEscapedDateTimeOffset(span, out value);
}

Debug.Assert(span.IndexOf(JsonConstants.BackSlash) == -1);

if (JsonHelpers.TryParseAsISO(span, out DateTimeOffset tmp))
{
value = tmp;
return true;
}

value = default;
return false;
return JsonReaderHelper.TryGetValue(span, ValueIsEscaped, out value);
}

/// <summary>
Expand Down
Loading