Skip to content

Perf | Port PR #328 to improve performance in .NET Framework #1084

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 9 commits into from
Aug 23, 2021
Merged

Perf | Port PR #328 to improve performance in .NET Framework #1084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d5b7a5b
Perf | Port PR #328 to improve performance in .NET Framework
cheenamalhotra May 25, 2021
c0f261d
Port #603 changes
cheenamalhotra May 25, 2021
28aac53
Merge branch 'main' of https://github.com/dotnet/SqlClient into port-…
cheenamalhotra Jul 19, 2021
a9a5017
Merge remote-tracking branch 'dotnet/main' into port-328-netfx
cheenamalhotra Aug 11, 2021
971ee1d
Fix conflict
cheenamalhotra Aug 11, 2021
1083f81
Merge branch 'main' of https://github.com/dotnet/SqlClient into port-…
cheenamalhotra Aug 20, 2021
0566d71
Fix missing return
cheenamalhotra Aug 20, 2021
218faad
Update test
cheenamalhotra Aug 23, 2021
9153301
Apply suggestions from code review
cheenamalhotra Aug 23, 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
15 changes: 11 additions & 4 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ public sealed class SqlCommand : DbCommand, ICloneable
/// Internal flag for testing purposes that forces all queries to internally end async calls.
/// </summary>
private static bool _forceInternalEndQuery = false;
#endif
#endif
internal static readonly Action<object> s_cancelIgnoreFailure = CancelIgnoreFailureCallback;

// devnote: Prepare
// Against 7.0 Server (Sphinx) a prepare/unprepare requires an extra roundtrip to the server.
Expand Down Expand Up @@ -914,6 +915,12 @@ protected override DbParameterCollection DbParameterCollection
return Parameters;
}
}

internal static void CancelIgnoreFailureCallback(object state)
{
SqlCommand command = (SqlCommand)state;
command.CancelIgnoreFailure();
}

internal void CancelIgnoreFailure()
{
Expand Down Expand Up @@ -2972,7 +2979,7 @@ private Task<int> InternalExecuteNonQueryAsync(CancellationToken cancellationTok
source.SetCanceled();
return source.Task;
}
registration = cancellationToken.Register(CancelIgnoreFailure);
registration = cancellationToken.Register(s_cancelIgnoreFailure, this);
}

Task<int> returnedTask = source.Task;
Expand Down Expand Up @@ -3069,7 +3076,7 @@ private Task<SqlDataReader> InternalExecuteReaderAsync(CommandBehavior behavior,
source.SetCanceled();
return source.Task;
}
registration = cancellationToken.Register(CancelIgnoreFailure);
registration = cancellationToken.Register(s_cancelIgnoreFailure, this);
}

Task<SqlDataReader> returnedTask = source.Task;
Expand Down Expand Up @@ -3215,7 +3222,7 @@ private Task<XmlReader> InternalExecuteXmlReaderAsync(CancellationToken cancella
source.SetCanceled();
return source.Task;
}
registration = cancellationToken.Register(CancelIgnoreFailure);
registration = cancellationToken.Register(s_cancelIgnoreFailure, this);
}

Task<XmlReader> returnedTask = source.Task;
Expand Down
Loading