Skip to content
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

PERF | Cleanup IDisposable in SqlDataReader #921

Closed
wants to merge 1 commit into from
Closed

PERF | Cleanup IDisposable in SqlDataReader #921

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
134 changes: 63 additions & 71 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlDataReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2966,7 +2966,7 @@ override public int GetValues(object[] values)
if ((sequentialAccess) && (i < maximumColumn))
{
_data[fieldIndex].Clear();
if (fieldIndex > i && fieldIndex>0)
if (fieldIndex > i && fieldIndex > 0)
{
// if we jumped an index forward because of a hidden column see if the buffer before the
// current one was populated by the seek forward and clear it if it was
Expand Down Expand Up @@ -4250,34 +4250,34 @@ public override Task<bool> NextResultAsync(CancellationToken cancellationToken)
source.SetException(ADP.ExceptionWithStackTrace(ADP.DataReaderClosed()));
return source.Task;
}

IDisposable registration = null;
if (cancellationToken.CanBeCanceled)
using (IDisposable registration = cancellationToken.CanBeCanceled ? cancellationToken.Register(SqlCommand.s_cancelIgnoreFailure, _command) : (IDisposable)null)
{
if (cancellationToken.IsCancellationRequested)
if (null != registration)
{
source.SetCanceled();
if (cancellationToken.IsCancellationRequested)
{
source.SetCanceled();
return source.Task;
}
}

Task original = Interlocked.CompareExchange(ref _currentTask, source.Task, null);
if (original != null)
{
source.SetException(ADP.ExceptionWithStackTrace(SQL.PendingBeginXXXExists()));
return source.Task;
}
registration = cancellationToken.Register(SqlCommand.s_cancelIgnoreFailure, _command);
}

Task original = Interlocked.CompareExchange(ref _currentTask, source.Task, null);
if (original != null)
{
source.SetException(ADP.ExceptionWithStackTrace(SQL.PendingBeginXXXExists()));
return source.Task;
}
// Check if cancellation due to close is requested (this needs to be done after setting _currentTask)
if (_cancelAsyncOnCloseToken.IsCancellationRequested)
{
source.SetCanceled();
_currentTask = null;
return source.Task;
}

// Check if cancellation due to close is requested (this needs to be done after setting _currentTask)
if (_cancelAsyncOnCloseToken.IsCancellationRequested)
{
source.SetCanceled();
_currentTask = null;
return source.Task;
return InvokeAsyncCall(new HasNextResultAsyncCallContext(this, source, registration));
}

return InvokeAsyncCall(new HasNextResultAsyncCallContext(this, source, registration));
}
finally
{
Expand Down Expand Up @@ -4515,7 +4515,7 @@ out bytesRead
if (!isContinuation)
{
// This is the first async operation which is happening - setup the _currentTask and timeout
Debug.Assert(context._source==null, "context._source should not be non-null when trying to change to async");
Debug.Assert(context._source == null, "context._source should not be non-null when trying to change to async");
source = new TaskCompletionSource<int>();
Task original = Interlocked.CompareExchange(ref _currentTask, source.Task, null);
if (original != null)
Expand Down Expand Up @@ -4681,31 +4681,28 @@ public override Task<bool> ReadAsync(CancellationToken cancellationToken)
return source.Task;
}

IDisposable registration = null;
if (cancellationToken.CanBeCanceled)
{
registration = cancellationToken.Register(SqlCommand.s_cancelIgnoreFailure, _command);
}

ReadAsyncCallContext context = null;
if (_connection?.InnerConnection is SqlInternalConnection sqlInternalConnection)
{
context = Interlocked.Exchange(ref sqlInternalConnection.CachedDataReaderReadAsyncContext, null);
}
if (context is null)
using (IDisposable registration = cancellationToken.CanBeCanceled ? cancellationToken.Register(SqlCommand.s_cancelIgnoreFailure, _command) : (IDisposable)null)
{
context = new ReadAsyncCallContext();
}
ReadAsyncCallContext context = null;
if (_connection?.InnerConnection is SqlInternalConnection sqlInternalConnection)
{
context = Interlocked.Exchange(ref sqlInternalConnection.CachedDataReaderReadAsyncContext, null);
}
if (context is null)
{
context = new ReadAsyncCallContext();
}

Debug.Assert(context._reader == null && context._source == null && context._disposable == null, "cached ReadAsyncCallContext was not properly disposed");
Debug.Assert(context._reader == null && context._source == null && context._disposable == null, "cached ReadAsyncCallContext was not properly disposed");

context.Set(this, source, registration);
context._hasMoreData = more;
context._hasReadRowToken = rowTokenRead;
context.Set(this, source, registration);
context._hasMoreData = more;
context._hasReadRowToken = rowTokenRead;

PrepareAsyncInvocation(useSnapshot: true);
PrepareAsyncInvocation(useSnapshot: true);

return InvokeAsyncCall(context);
return InvokeAsyncCall(context);
}
}
finally
{
Expand Down Expand Up @@ -4859,31 +4856,29 @@ override public Task<bool> IsDBNullAsync(int i, CancellationToken cancellationTo
}

// Setup cancellations
IDisposable registration = null;
if (cancellationToken.CanBeCanceled)
using (IDisposable registration = cancellationToken.CanBeCanceled ? cancellationToken.Register(SqlCommand.s_cancelIgnoreFailure, _command) : (IDisposable)null)
{
registration = cancellationToken.Register(SqlCommand.s_cancelIgnoreFailure, _command);
}

IsDBNullAsyncCallContext context = null;
if (_connection?.InnerConnection is SqlInternalConnection sqlInternalConnection)
{
context = Interlocked.Exchange(ref sqlInternalConnection.CachedDataReaderIsDBNullContext, null);
}
if (context is null)
{
context = new IsDBNullAsyncCallContext();
}
IsDBNullAsyncCallContext context = null;
if (_connection?.InnerConnection is SqlInternalConnection sqlInternalConnection)
{
context = Interlocked.Exchange(ref sqlInternalConnection.CachedDataReaderIsDBNullContext, null);
}
if (context is null)
{
context = new IsDBNullAsyncCallContext();
}

Debug.Assert(context._reader == null && context._source == null && context._disposable == null, "cached ISDBNullAsync context not properly disposed");
Debug.Assert(context._reader == null && context._source == null && context._disposable == null, "cached ISDBNullAsync context not properly disposed");

context.Set(this, source, registration);
context._columnIndex = i;
context.Set(this, source, registration);
context._columnIndex = i;

// Setup async
PrepareAsyncInvocation(useSnapshot: true);
// Setup async
PrepareAsyncInvocation(useSnapshot: true);

return InvokeAsyncCall(context);
return InvokeAsyncCall(context);
}
}
}

Expand Down Expand Up @@ -5006,16 +5001,13 @@ override public Task<T> GetFieldValueAsync<T>(int i, CancellationToken cancellat
}

// Setup cancellations
IDisposable registration = null;
if (cancellationToken.CanBeCanceled)
using (IDisposable registration = cancellationToken.CanBeCanceled ? cancellationToken.Register(s => ((SqlCommand)s).CancelIgnoreFailure(), _command) : (IDisposable)null)
{
registration = cancellationToken.Register(s => ((SqlCommand)s).CancelIgnoreFailure(), _command);
}

// Setup async
PrepareAsyncInvocation(useSnapshot: true);
// Setup async
PrepareAsyncInvocation(useSnapshot: true);

return InvokeAsyncCall(new GetFieldValueAsyncCallContext<T>(this, source, registration, i));
return InvokeAsyncCall(new GetFieldValueAsyncCallContext<T>(this, source, registration, i));
}
}

private static Task<T> GetFieldValueAsyncExecute<T>(Task task, object state)
Expand Down Expand Up @@ -5112,8 +5104,8 @@ internal void Clear()
_source = null;
_reader = null;
IDisposable copyDisposable = _disposable;
_disposable = null;
copyDisposable?.Dispose();
_disposable = null;
}

internal abstract Func<Task, object, Task<T>> Execute { get; }
Expand Down
Loading