Skip to content

[release/8.0] Merge release/8.0-staging to release/8.0 #36531

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 2 commits into from
Aug 8, 2025
Merged

[release/8.0] Merge release/8.0-staging to release/8.0 #36531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c69b794
Merge pull request #36197 from dotnet/release/8.0
cincuranet Jun 5, 2025
08cefb3
Dispose related readers in GroupBySplitQueryingEnumerable (#36484) (#…
roji Aug 4, 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
37 changes: 30 additions & 7 deletions src/EFCore.Relational/Query/Internal/GroupBySplitQueryingEnumerable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,19 @@ public void Dispose()
{
_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);
_dataReader.Dispose();

if (_resultCoordinator != null)
{
foreach (var dataReader in _resultCoordinator.DataReaders)
{
dataReader?.DataReader.Dispose();
}

_resultCoordinator.DataReaders.Clear();

_resultCoordinator = null;
}

_dataReader = null;
_dbDataReader = null;
}
Expand Down Expand Up @@ -503,20 +516,30 @@ private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator
return false;
}

public ValueTask DisposeAsync()
public async ValueTask DisposeAsync()
{
if (_dataReader is not null)
if (_dataReader != null)
{
_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);
await _dataReader.DisposeAsync().ConfigureAwait(false);

if (_resultCoordinator != null)
{
foreach (var dataReader in _resultCoordinator.DataReaders)
{
if (dataReader != null)
{
await dataReader.DataReader.DisposeAsync().ConfigureAwait(false);
}
}

_resultCoordinator.DataReaders.Clear();
_resultCoordinator = null;
}

var dataReader = _dataReader;
_dataReader = null;
_dbDataReader = null;

return dataReader.DisposeAsync();
}

return default;
}
}
}
2 changes: 2 additions & 0 deletions src/EFCore.Relational/Query/Internal/SplitQueryingEnumerable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ public void Dispose()
{
_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);
_dataReader.Dispose();

if (_resultCoordinator != null)
{
foreach (var dataReader in _resultCoordinator.DataReaders)
Expand Down Expand Up @@ -407,6 +408,7 @@ public async ValueTask DisposeAsync()
{
_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);
await _dataReader.DisposeAsync().ConfigureAwait(false);

if (_resultCoordinator != null)
{
foreach (var dataReader in _resultCoordinator.DataReaders)
Expand Down
Loading