Query: Use cancellationToken appropriately (#25918)

dotnet · Sep 8, 2021 · 804ff9e · 804ff9e
1 parent 6c1694a
commit 804ff9e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...uery/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs b/...uery/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
@@ -1482,10 +1482,11 @@ private static async Task PopulateSplitIncludeCollectionAsync<TIncludingEntity,
                             (queryContext, relationalCommandCache, detailedErrorsEnabled),
                             ((RelationalQueryContext, RelationalCommandCache, bool) tup, CancellationToken cancellationToken)
                                 => InitializeReaderAsync(tup.Item1, tup.Item2, tup.Item3, cancellationToken),
-                            verifySucceeded: null)
+                            verifySucceeded: null,
+                            queryContext.CancellationToken)
                         .ConfigureAwait(false);
 
-                    async Task<RelationalDataReader> InitializeReaderAsync(
+                    static async Task<RelationalDataReader> InitializeReaderAsync(
                         RelationalQueryContext queryContext,
                         RelationalCommandCache relationalCommandCache,
                         bool detailedErrorsEnabled,
@@ -1801,10 +1802,11 @@ private static async Task PopulateSplitCollectionAsync<TCollection, TElement, TR
                             (queryContext, relationalCommandCache, detailedErrorsEnabled),
                             ((RelationalQueryContext, RelationalCommandCache, bool) tup, CancellationToken cancellationToken)
                                 => InitializeReaderAsync(tup.Item1, tup.Item2, tup.Item3, cancellationToken),
-                            verifySucceeded: null)
+                            verifySucceeded: null,
+                            queryContext.CancellationToken)
                         .ConfigureAwait(false);
 
-                    async Task<RelationalDataReader> InitializeReaderAsync(
+                    static async Task<RelationalDataReader> InitializeReaderAsync(
                         RelationalQueryContext queryContext,
                         RelationalCommandCache relationalCommandCache,
                         bool detailedErrorsEnabled,