Skip to content

Allow specifying ReadOnlySequence<byte> for JSON documents to avoid temporairly memory allocations #4249

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

Closed
martinmine wants to merge 2 commits into from
Closed

Allow specifying ReadOnlySequence<byte> for JSON documents to avoid temporairly memory allocations #4249

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b7d979
Allow specifying ReadOnlySequence for high perf json inserts
martinmine Dec 28, 2021
5e90313
Removed exceptions used for debugging
martinmine Dec 28, 2021
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
54 changes: 45 additions & 9 deletions src/Npgsql/Internal/TypeHandlers/JsonHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Buffers;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Text;
Expand Down Expand Up @@ -65,10 +66,8 @@ protected internal override int ValidateAndGetLengthCustom<TAny>([DisallowNull]
if (lengthCache.IsPopulated)
return lengthCache.Get();

var data = SerializeJsonDocument((JsonDocument)(object)value!);
if (parameter != null)
parameter.ConvertedValue = data;
return lengthCache.Set(data.Length + _headerLen);
var paramLength = GetSizeOfSerializedValue(parameter, (object)value!);
return lengthCache.Set(paramLength + _headerLen);
}

// User POCO, need to serialize. At least internally ArrayPool buffers are used...
Expand All @@ -79,6 +78,28 @@ protected internal override int ValidateAndGetLengthCustom<TAny>([DisallowNull]
return _textHandler.ValidateAndGetLength(s, ref lengthCache, parameter) + _headerLen;
}

private int GetSizeOfSerializedValue(NpgsqlParameter? parameter, object value)
{
if (parameter?.ConvertedValue != null)
{
if (parameter.ConvertedValue is ReadOnlySequence<byte> sequence)
{
return (int)sequence.Length;
}
else
{
return ((byte[])parameter.ConvertedValue).Length;
}
}
var serializedBytes = SerializeJsonDocument((JsonDocument)value);
if (parameter != null)
{
parameter.ConvertedValue = serializedBytes;
}

return serializedBytes.Length;
}

/// <inheritdoc />
protected override async Task WriteWithLengthCustom<TAny>([DisallowNull] TAny value, NpgsqlWriteBuffer buf, NpgsqlLengthCache? lengthCache, NpgsqlParameter? parameter, bool async, CancellationToken cancellationToken = default)
{
Expand All @@ -104,10 +125,25 @@ protected override async Task WriteWithLengthCustom<TAny>([DisallowNull] TAny va
await _textHandler.Write((byte[])(object)value!, buf, lengthCache, parameter, async, cancellationToken);
else if (typeof(TAny) == typeof(JsonDocument))
{
var data = parameter?.ConvertedValue != null
? (byte[])parameter.ConvertedValue
: SerializeJsonDocument((JsonDocument)(object)value!);
await buf.WriteBytesRaw(data, async, cancellationToken);
if (parameter?.ConvertedValue != null)
{
if (parameter.ConvertedValue is ReadOnlySequence<byte> sequence)
{
foreach (var segment in sequence)
{
buf.DirectWrite(segment.Span);
}
}
else
{
await buf.WriteBytesRaw((byte[])parameter.ConvertedValue, async, cancellationToken);
}
}
else
{
var data = SerializeJsonDocument((JsonDocument)(object)value!);
await buf.WriteBytesRaw(data, async, cancellationToken);
}
}
else
{
Expand Down Expand Up @@ -227,4 +263,4 @@ byte[] SerializeJsonDocument(JsonDocument document)
writer.Flush();
return stream.ToArray();
}
}
}