Merge pull request #36531 from dotnet/release/8.0-staging

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

Author: cincuranet

src/EFCore.Relational/Query/Internal/GroupBySplitQueryingEnumerable.cs

@@ -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;
             }
@@ -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;
         }
     }
 }

src/EFCore.Relational/Query/Internal/SplitQueryingEnumerable.cs

@@ -251,6 +251,7 @@ public void Dispose()
             {
                 _relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);
                 _dataReader.Dispose();
+
                 if (_resultCoordinator != null)
                 {
                     foreach (var dataReader in _resultCoordinator.DataReaders)
@@ -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)