-
Notifications
You must be signed in to change notification settings - Fork 5.2k
Add write-raw APIs to Utf8JsonWriter #54254
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
2b9a5ec
Add write-raw APIs to Utf8JsonWriter
layomia 3ac5592
Address review feedback
layomia e47ee37
Address review feedback
layomia eea5f1b
Address review feedback
layomia e158057
Make long-running tests outerloop
layomia 86584f0
Fix call to core logic
layomia File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
107 changes: 107 additions & 0 deletions
107
src/libraries/System.Text.Json/src/System/Text/Json/Writer/Utf8JsonWriter.WriteValues.Raw.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| // 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; | ||
|
|
||
| namespace System.Text.Json | ||
| { | ||
| public sealed partial class Utf8JsonWriter | ||
| { | ||
| /// <summary> | ||
| /// Writes the input as JSON content. | ||
| /// </summary> | ||
| /// <param name="json">The raw JSON content to write.</param> | ||
| /// <param name="skipInputValidation">Whether to skip validation of the input JSON content.</param> | ||
| public void WriteRawValue(string json, bool skipInputValidation = false) | ||
| { | ||
| if (json == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(json)); | ||
| } | ||
|
|
||
| WriteRawValue(json.AsSpan(), skipInputValidation); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Writes the input as JSON content. | ||
| /// </summary> | ||
| /// <param name="json">The raw JSON content to write.</param> | ||
| /// <param name="skipInputValidation">Whether to skip validation of the input JSON content.</param> | ||
| public void WriteRawValue(ReadOnlySpan<char> json, bool skipInputValidation = false) | ||
layomia marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| byte[]? tempArray = null; | ||
|
|
||
| // For performance, avoid obtaining actual byte count unless memory usage is higher than the threshold. | ||
| Span<byte> utf8Json = json.Length <= (JsonConstants.ArrayPoolMaxSizeBeforeUsingNormalAlloc / JsonConstants.MaxExpansionFactorWhileTranscoding) ? | ||
| // Use a pooled alloc. | ||
| tempArray = ArrayPool<byte>.Shared.Rent(json.Length * JsonConstants.MaxExpansionFactorWhileTranscoding) : | ||
| // Use a normal alloc since the pool would create a normal alloc anyway based on the threshold (per current implementation) | ||
| // and by using a normal alloc we can avoid the Clear(). | ||
| new byte[JsonReaderHelper.GetUtf8ByteCount(json)]; | ||
|
|
||
| try | ||
| { | ||
| int actualByteCount = JsonReaderHelper.GetUtf8FromText(json, utf8Json); | ||
| utf8Json = utf8Json.Slice(0, actualByteCount); | ||
| WriteRawValue(utf8Json, skipInputValidation); | ||
layomia marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
| finally | ||
| { | ||
| if (tempArray != null) | ||
| { | ||
| utf8Json.Clear(); | ||
| ArrayPool<byte>.Shared.Return(tempArray); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Writes the input as JSON content. | ||
| /// </summary> | ||
| /// <param name="utf8Json">The raw JSON content to write.</param> | ||
| /// <param name="skipInputValidation">Whether to skip validation of the input JSON content.</param> | ||
layomia marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| public void WriteRawValue(ReadOnlySpan<byte> utf8Json, bool skipInputValidation = false) | ||
layomia marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| { | ||
| if (utf8Json.Length == 0) | ||
| { | ||
| ThrowHelper.ThrowArgumentException(SR.ExpectedJsonTokens); | ||
| } | ||
|
|
||
| if (!skipInputValidation) | ||
| { | ||
| Utf8JsonReader reader = new Utf8JsonReader(utf8Json); | ||
layomia marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| try | ||
| { | ||
| while (reader.Read()); | ||
| } | ||
| catch (JsonReaderException ex) | ||
| { | ||
| ThrowHelper.ThrowArgumentException(ex.Message); | ||
| } | ||
layomia marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| int maxRequired = utf8Json.Length + 1; // Optionally, 1 list separator | ||
layomia marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| if (_memory.Length - BytesPending < maxRequired) | ||
layomia marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| Grow(maxRequired); | ||
| } | ||
|
|
||
| Span<byte> output = _memory.Span; | ||
|
|
||
| if (_currentDepth < 0) | ||
| { | ||
| output[BytesPending++] = JsonConstants.ListSeparator; | ||
| } | ||
|
|
||
| utf8Json.CopyTo(output.Slice(BytesPending)); | ||
| BytesPending += utf8Json.Length; | ||
|
|
||
| SetFlagToAddListSeparatorBeforeNextItem(); | ||
|
|
||
| // Treat all raw JSON value writes as string. | ||
| _tokenType = JsonTokenType.String; | ||
layomia marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
| } | ||
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.
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.
Uh oh!
There was an error while loading. Please reload this page.