NotificationsYou must be signed in to change notification settings
Fork3.3k
Star14.5k

Commit08f094b

authored

Dispose related readers in GroupBySplitQueryingEnumerable (#36484)

1 parentf13fcb1 commit08f094bCopy full SHA for 08f094b

File tree

2 files changed

+32

-7

lines changed

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

2 files changed

+32

-7

lines changed

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

Lines changed: 30 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -360,6 +360,19 @@ public void Dispose()`
`360`	`360`	`{`
`361`	`361`	`_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);`
`362`	`362`	`_dataReader.Dispose();`
	`363`	`+`
	`364`	`+if(_resultCoordinator!=null)`
	`365`	`+{`
	`366`	`+foreach(vardataReaderin_resultCoordinator.DataReaders)`
	`367`	`+{`
	`368`	`+dataReader?.DataReader.Dispose();`
	`369`	`+}`
	`370`	`+`
	`371`	`+_resultCoordinator.DataReaders.Clear();`
	`372`	`+`
	`373`	`+_resultCoordinator=null;`
	`374`	`+}`
	`375`	`+`
`363`	`376`	`_dataReader=null;`
`364`	`377`	`_dbDataReader=null;`
`365`	`378`	`}`
`@@ -526,20 +539,30 @@ private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator`
`526`	`539`	`returnfalse;`
`527`	`540`	`}`
`528`	`541`
`529`		`-publicValueTaskDisposeAsync()`
	`542`	`+publicasyncValueTaskDisposeAsync()`
`530`	`543`	`{`
`531`		`-if(_dataReaderis notnull)`
	`544`	`+if(_dataReader!=null)`
`532`	`545`	`{`
`533`	`546`	`_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);`
	`547`	`+await_dataReader.DisposeAsync().ConfigureAwait(false);`
	`548`	`+`
	`549`	`+if(_resultCoordinator!=null)`
	`550`	`+{`
	`551`	`+foreach(vardataReaderin_resultCoordinator.DataReaders)`
	`552`	`+{`
	`553`	`+if(dataReader!=null)`
	`554`	`+{`
	`555`	`+awaitdataReader.DataReader.DisposeAsync().ConfigureAwait(false);`
	`556`	`+}`
	`557`	`+}`
	`558`	`+`
	`559`	`+_resultCoordinator.DataReaders.Clear();`
	`560`	`+_resultCoordinator=null;`
	`561`	`+}`
`534`	`562`
`535`		`-vardataReader=_dataReader;`
`536`	`563`	`_dataReader=null;`
`537`	`564`	`_dbDataReader=null;`
`538`		`-`
`539`		`-returndataReader.DisposeAsync();`
`540`	`565`	`}`
`541`		`-`
`542`		`-returndefault;`
`543`	`566`	`}`
`544`	`567`	`}`
`545`	`568`	`}`

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,7 @@ public void Dispose()`
`281`	`281`	`{`
`282`	`282`	`_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);`
`283`	`283`	`_dataReader.Dispose();`
	`284`	`+`
`284`	`285`	`if(_resultCoordinator!=null)`
`285`	`286`	`{`
`286`	`287`	`foreach(vardataReaderin_resultCoordinator.DataReaders)`
`@@ -430,6 +431,7 @@ public async ValueTask DisposeAsync()`
`430`	`431`	`{`
`431`	`432`	`_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);`
`432`	`433`	`await_dataReader.DisposeAsync().ConfigureAwait(false);`
	`434`	`+`
`433`	`435`	`if(_resultCoordinator!=null)`
`434`	`436`	`{`
`435`	`437`	`foreach(vardataReaderin_resultCoordinator.DataReaders)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit08f094b

File tree

2 files changed

2 files changed

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

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

0 commit comments