Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Merge | TaskToApm #3263

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 4 commits into from
Apr 24, 2025
Merged

Merge | TaskToApm #3263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42bb222
Eliminate TPL to APM implementation in favor of MSDN guide.
benrr101 Apr 8, 2025
28e8ad5
Remove TaskToApm
benrr101 Apr 8, 2025
72a4290
Use TaskToAsyncResult for netcore
benrr101 Apr 11, 2025
dd0b4cb
Reverting re-write of netfx begin implementation
benrr101 Apr 16, 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
189 changes: 0 additions & 189 deletions src/Microsoft.Data.SqlClient/netcore/src/Common/System/Threading/Tasks/TaskToApm.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,6 @@
</Compile>

<Compile Include="Common\System\NotImplemented.cs" />
<Compile Include="Common\System\Threading\Tasks\TaskToApm.cs" />
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
<Compile Include="Microsoft\Data\SqlClient\SNI\ConcurrentQueueSemaphore.cs" />
<Compile Include="Microsoft\Data\SqlClient\SNI\SNIError.cs" />
Expand Down
19 changes: 14 additions & 5 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

using System;
using System.Diagnostics;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Data.Common;

namespace Microsoft.Data.SqlClient
{
sealed internal class SqlSequentialStream : System.IO.Stream
internal sealed class SqlSequentialStream : Stream
{
private SqlDataReader _reader; // The SqlDataReader that we are reading data from
private readonly int _columnIndex; // The index of out column in the table
Expand Down Expand Up @@ -302,7 +303,7 @@ public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, Asy
Task readTask = ReadAsync(buffer, offset, count, CancellationToken.None);
if (callback != null)
{
readTask.ContinueWith((t) => callback(t), TaskScheduler.Default);
readTask.ContinueWith(t => callback(t), TaskScheduler.Default);
}
return readTask;
}
Expand All @@ -328,11 +329,19 @@ public override int EndRead(IAsyncResult asyncResult)
return readTask.Result;
}
#else
public override IAsyncResult BeginRead(byte[] array, int offset, int count, AsyncCallback asyncCallback, object asyncState) =>
TaskToApm.Begin(ReadAsync(array, offset, count, CancellationToken.None), asyncCallback, asyncState);
public override IAsyncResult BeginRead(
byte[] array,
int offset,
int count,
AsyncCallback asyncCallback,
object asyncState)
{
Task<int> readTask = ReadAsync(array, offset, count, CancellationToken.None);
return TaskToAsyncResult.Begin(readTask, asyncCallback, asyncState);
}

public override int EndRead(IAsyncResult asyncResult) =>
TaskToApm.End<int>(asyncResult);
TaskToAsyncResult.End<int>(asyncResult);
#endif
}
}
Loading