Skip to content

Revert incorrect "fix" and improve test. #9

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

Revert incorrect "fix" and improve test. #9

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
8 changes: 6 additions & 2 deletions Xledger.Collections.Test/TestMemoryOwner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,19 @@ public void TestSlice() {
#if NET
[Fact]
public void TestStream_ToMemoryOwner() {
byte[] array = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
// This length should be larger than the default GetCopyBufferSize.
byte[] array = new byte[4 * 1024 * 1024 + 3];
new Random().NextBytes(array);
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];
// This length should be larger than the default GetCopyBufferSize.
byte[] array = new byte[4 * 1024 * 1024 + 3];
new Random().NextBytes(array);
var ms = new MemoryStream(array);
using var memoryOwner = await ms.ToOwnedMemoryAsync();
Assert.Equal(array.AsMemory(), memoryOwner.Memory);
Expand Down
8 changes: 6 additions & 2 deletions Xledger.Collections/Memory/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ public static IMemoryOwner<byte> ToOwnedMemory(this Stream source, bool leaveOpe

try {
while (true) {
int bytesRead = source.Read(currentBuffer.Span);
var dest = currentBuffer.Slice(totalBytesRead);

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

if (bytesRead == 0) {
break;
Expand Down Expand Up @@ -100,7 +102,9 @@ public static async Task<IMemoryOwner<byte>> ToOwnedMemoryAsync(this Stream sour
while (true) {
tok.ThrowIfCancellationRequested();

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

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

if (bytesRead == 0) {
break;
Expand Down