Skip to content

Fix test and bugs in Stream.ToOwnedMemory. #8

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
isaksky merged 1 commit into from
May 16, 2025
Merged

Fix test and bugs in Stream.ToOwnedMemory. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions Xledger.Collections.Test/TestMemoryOwner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Buffers;
using System.IO;
using System.Threading.Tasks;
using Xledger.Collections.Memory;

namespace Xledger.Collections.Test;
Expand All @@ -20,4 +22,22 @@ public void TestSlice() {
IMemoryOwner<byte> sliced2 = sliced.Slice(1, 4);
Assert.Equal(array.AsMemory().Slice(3).Slice(1, 4), sliced2.Memory);
}

#if NET
[Fact]
public void TestStream_ToMemoryOwner() {
byte[] array = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
var ms = new MemoryStream(array);
using var memoryOwner = ms.ToOwnedMemory();
Assert.Equal(array.AsMemory(), memoryOwner.Memory);
}

[Fact]
public async Task TestStream_ToMemoryOwnerAsync() {
byte[] array = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
var ms = new MemoryStream(array);
using var memoryOwner = await ms.ToOwnedMemoryAsync();
Assert.Equal(array.AsMemory(), memoryOwner.Memory);
}
#endif
}
4 changes: 2 additions & 2 deletions Xledger.Collections.Test/Xledger.Collections.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
16 changes: 6 additions & 10 deletions Xledger.Collections/Memory/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ public static IMemoryOwner<byte> ToOwnedMemory(this Stream source, bool leaveOpe

try {
while (true) {
var dest = currentBuffer.Slice(totalBytesRead);

int bytesRead = source.Read(dest.Span);
int bytesRead = source.Read(currentBuffer.Span);

if (bytesRead == 0) {
break;
Expand Down Expand Up @@ -68,7 +66,7 @@ public static IMemoryOwner<byte> ToOwnedMemory(this Stream source, bool leaveOpe
var newOwner = MemoryPool<byte>.Shared.Rent((int)newCapacity);
var newBuffer = newOwner.Memory;

currentBuffer.Slice(0, totalBytesRead).CopyTo(newBuffer);
currentBuffer.CopyTo(newBuffer);
currentOwner.Dispose();
currentOwner = newOwner;
currentBuffer = newBuffer;
Expand All @@ -82,7 +80,7 @@ public static IMemoryOwner<byte> ToOwnedMemory(this Stream source, bool leaveOpe
}
}

return currentOwner.Slice(totalBytesRead);
return currentOwner.Slice(0, totalBytesRead);
}

static readonly byte[] ASYNC_PROBE = new byte[1];
Expand All @@ -102,9 +100,7 @@ public static async Task<IMemoryOwner<byte>> ToOwnedMemoryAsync(this Stream sour
while (true) {
tok.ThrowIfCancellationRequested();

var dest = currentBuffer.Slice(totalBytesRead);

int bytesRead = await source.ReadAsync(dest, tok).ConfigureAwait(false);
int bytesRead = await source.ReadAsync(currentBuffer, tok).ConfigureAwait(false);

if (bytesRead == 0) {
break;
Expand All @@ -131,7 +127,7 @@ public static async Task<IMemoryOwner<byte>> ToOwnedMemoryAsync(this Stream sour
var newOwner = MemoryPool<byte>.Shared.Rent((int)newCapacity);
var newBuffer = newOwner.Memory;

currentBuffer.Slice(0, totalBytesRead).CopyTo(newBuffer);
currentBuffer.CopyTo(newBuffer);
currentOwner.Dispose();
currentOwner = newOwner;
currentBuffer = newBuffer;
Expand All @@ -145,7 +141,7 @@ public static async Task<IMemoryOwner<byte>> ToOwnedMemoryAsync(this Stream sour
}
}

return currentOwner.Slice(totalBytesRead);
return currentOwner.Slice(0, totalBytesRead);
}

// Copied from System.IO.Stream, adapted to be static
Expand Down