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

Commita6dd6d6

authored

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

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

2 parents9a53711 +08cefb3 commita6dd6d6Copy full SHA for a6dd6d6

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
`@@ -330,6 +330,19 @@ public void Dispose()`
`330`	`330`	`{`
`331`	`331`	`_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);`
`332`	`332`	`_dataReader.Dispose();`
	`333`	`+`
	`334`	`+if(_resultCoordinator!=null)`
	`335`	`+{`
	`336`	`+foreach(vardataReaderin_resultCoordinator.DataReaders)`
	`337`	`+{`
	`338`	`+dataReader?.DataReader.Dispose();`
	`339`	`+}`
	`340`	`+`
	`341`	`+_resultCoordinator.DataReaders.Clear();`
	`342`	`+`
	`343`	`+_resultCoordinator=null;`
	`344`	`+}`
	`345`	`+`
`333`	`346`	`_dataReader=null;`
`334`	`347`	`_dbDataReader=null;`
`335`	`348`	`}`
`@@ -503,20 +516,30 @@ private static async Task<bool> InitializeReaderAsync(AsyncEnumerator enumerator`
`503`	`516`	`returnfalse;`
`504`	`517`	`}`
`505`	`518`
`506`		`-publicValueTaskDisposeAsync()`
	`519`	`+publicasyncValueTaskDisposeAsync()`
`507`	`520`	`{`
`508`		`-if(_dataReaderis notnull)`
	`521`	`+if(_dataReader!=null)`
`509`	`522`	`{`
`510`	`523`	`_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);`
	`524`	`+await_dataReader.DisposeAsync().ConfigureAwait(false);`
	`525`	`+`
	`526`	`+if(_resultCoordinator!=null)`
	`527`	`+{`
	`528`	`+foreach(vardataReaderin_resultCoordinator.DataReaders)`
	`529`	`+{`
	`530`	`+if(dataReader!=null)`
	`531`	`+{`
	`532`	`+awaitdataReader.DataReader.DisposeAsync().ConfigureAwait(false);`
	`533`	`+}`
	`534`	`+}`
	`535`	`+`
	`536`	`+_resultCoordinator.DataReaders.Clear();`
	`537`	`+_resultCoordinator=null;`
	`538`	`+}`
`511`	`539`
`512`		`-vardataReader=_dataReader;`
`513`	`540`	`_dataReader=null;`
`514`	`541`	`_dbDataReader=null;`
`515`		`-`
`516`		`-returndataReader.DisposeAsync();`
`517`	`542`	`}`
`518`		`-`
`519`		`-returndefault;`
`520`	`543`	`}`
`521`	`544`	`}`
`522`	`545`	`}`

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -251,6 +251,7 @@ public void Dispose()`
`251`	`251`	`{`
`252`	`252`	`_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);`
`253`	`253`	`_dataReader.Dispose();`
	`254`	`+`
`254`	`255`	`if(_resultCoordinator!=null)`
`255`	`256`	`{`
`256`	`257`	`foreach(vardataReaderin_resultCoordinator.DataReaders)`
`@@ -407,6 +408,7 @@ public async ValueTask DisposeAsync()`
`407`	`408`	`{`
`408`	`409`	`_relationalQueryContext.Connection.ReturnCommand(_relationalCommand!);`
`409`	`410`	`await_dataReader.DisposeAsync().ConfigureAwait(false);`
	`411`	`+`
`410`	`412`	`if(_resultCoordinator!=null)`
`411`	`413`	`{`
`412`	`414`	`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!

Commita6dd6d6

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