Skip to content

Commit 804ff9e

Browse files
authored
Query: Use cancellationToken appropriately (#25918)
1 parent 6c1694a commit 804ff9e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Diff for: src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs

+6-4
Original file line numberDiff line numberDiff line change
@@ -1482,10 +1482,11 @@ private static async Task PopulateSplitIncludeCollectionAsync<TIncludingEntity,
14821482
(queryContext, relationalCommandCache, detailedErrorsEnabled),
14831483
((RelationalQueryContext, RelationalCommandCache, bool) tup, CancellationToken cancellationToken)
14841484
=> InitializeReaderAsync(tup.Item1, tup.Item2, tup.Item3, cancellationToken),
1485-
verifySucceeded: null)
1485+
verifySucceeded: null,
1486+
queryContext.CancellationToken)
14861487
.ConfigureAwait(false);
14871488

1488-
async Task<RelationalDataReader> InitializeReaderAsync(
1489+
static async Task<RelationalDataReader> InitializeReaderAsync(
14891490
RelationalQueryContext queryContext,
14901491
RelationalCommandCache relationalCommandCache,
14911492
bool detailedErrorsEnabled,
@@ -1801,10 +1802,11 @@ private static async Task PopulateSplitCollectionAsync<TCollection, TElement, TR
18011802
(queryContext, relationalCommandCache, detailedErrorsEnabled),
18021803
((RelationalQueryContext, RelationalCommandCache, bool) tup, CancellationToken cancellationToken)
18031804
=> InitializeReaderAsync(tup.Item1, tup.Item2, tup.Item3, cancellationToken),
1804-
verifySucceeded: null)
1805+
verifySucceeded: null,
1806+
queryContext.CancellationToken)
18051807
.ConfigureAwait(false);
18061808

1807-
async Task<RelationalDataReader> InitializeReaderAsync(
1809+
static async Task<RelationalDataReader> InitializeReaderAsync(
18081810
RelationalQueryContext queryContext,
18091811
RelationalCommandCache relationalCommandCache,
18101812
bool detailedErrorsEnabled,

0 commit comments

Comments
 (0)