fixup! Implement multiple get and put for query cache and query batch

fredericDelaporte · fredericDelaporte · commit 1be92d8e986e · 2018-07-11T09:34:09.000+02:00
Use a default parameter value for minimizing changes, and upgrade
AsyncGenerator for supporting it.
diff --git a/Tools/packages.config b/Tools/packages.config
@@ -7,7 +7,7 @@
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
   <package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
   <package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
-  <package id="CSharpAsyncGenerator.CommandLine" version="0.8.2.7" targetFramework="net461" />
+  <package id="CSharpAsyncGenerator.CommandLine" version="0.8.2.9" targetFramework="net461" />
   <package id="vswhere" version="2.1.4" targetFramework="net461" />
   <package id="gitreleasemanager" version="0.7.0" targetFramework="net461" />
 </packages>
diff --git a/src/AsyncGenerator.yml b/src/AsyncGenerator.yml
@@ -98,6 +98,12 @@
     - conversion: Ignore
       name: QuoteTableAndColumns
       containingTypeName: SchemaMetadataUpdater
+    - conversion: Ignore
+      name: GetEnumerator
+      containingTypeName: DelayedEnumerator
+    - conversion: Ignore
+      name: GetEnumerator
+      containingTypeName: IFutureEnumerable
     - conversion: ToAsync
       name: ExecuteReader
       containingTypeName: IBatcher
diff --git a/src/NHibernate.Test/Async/TransformTests/AliasToBeanResultTransformerFixture.cs b/src/NHibernate.Test/Async/TransformTests/AliasToBeanResultTransformerFixture.cs
@@ -304,7 +304,7 @@ public async Task SerializationAsync()
 				var transformer = Transformers.AliasToBean<T>();
 				var bytes = SerializationHelper.Serialize(transformer);
 				transformer = (IResultTransformer)SerializationHelper.Deserialize(bytes);
-				return AssertCardinalityNameAndIdAsync<T>(transformer: transformer, cancellationToken:cancellationToken);
+				return AssertCardinalityNameAndIdAsync<T>(transformer: transformer, cancellationToken: cancellationToken);
 			}
 			catch (System.Exception ex)
 			{
diff --git a/src/NHibernate/Async/Impl/MultiCriteriaImpl.cs b/src/NHibernate/Async/Impl/MultiCriteriaImpl.cs
@@ -200,8 +200,7 @@ private async Task GetResultsFromDatabaseAsync(IList results, CancellationToken
 					for (int i = 0; i < loaders.Count; i++)
 					{
 						CriteriaLoader loader = loaders[i];
-						await (loader.InitializeEntitiesAndCollectionsAsync(
-							hydratedObjects[i], reader, session, session.DefaultReadOnly, null, cancellationToken)).ConfigureAwait(false);
+						await (loader.InitializeEntitiesAndCollectionsAsync(hydratedObjects[i], reader, session, session.DefaultReadOnly, cancellationToken: cancellationToken)).ConfigureAwait(false);
 
 						if (createSubselects[i])
 						{
diff --git a/src/NHibernate/Async/Impl/MultiQueryImpl.cs b/src/NHibernate/Async/Impl/MultiQueryImpl.cs
@@ -172,8 +172,7 @@ protected async Task<List<object>> DoListAsync(CancellationToken cancellationTok
 						ITranslator translator = translators[i];
 						QueryParameters parameter = parameters[i];
 
-						await (translator.Loader.InitializeEntitiesAndCollectionsAsync(
-							hydratedObjects[i], reader, session, false, null, cancellationToken)).ConfigureAwait(false);
+						await (translator.Loader.InitializeEntitiesAndCollectionsAsync(hydratedObjects[i], reader, session, false, cancellationToken: cancellationToken)).ConfigureAwait(false);
 
 						if (createSubselects[i])
 						{
diff --git a/src/NHibernate/Async/Loader/Loader.cs b/src/NHibernate/Async/Loader/Loader.cs
@@ -129,8 +129,7 @@ protected async Task<object> LoadSingleRowAsync(DbDataReader resultSet, ISession
 												 queryParameters.NamedParameters);
 			}
 
-			await (InitializeEntitiesAndCollectionsAsync(
-				hydratedObjects, resultSet, session, queryParameters.IsReadOnly(session), null, cancellationToken)).ConfigureAwait(false);
+			await (InitializeEntitiesAndCollectionsAsync(hydratedObjects, resultSet, session, queryParameters.IsReadOnly(session), cancellationToken: cancellationToken)).ConfigureAwait(false);
 			await (session.PersistenceContext.InitializeNonLazyCollectionsAsync(cancellationToken)).ConfigureAwait(false);
 			return result;
 		}
@@ -322,8 +321,7 @@ private async Task<IList> DoQueryAsync(ISessionImplementor session, QueryParamet
 					session.Batcher.CloseCommand(st, rs);
 				}
 
-				await (InitializeEntitiesAndCollectionsAsync(
-					hydratedObjects, rs, session, queryParameters.IsReadOnly(session), null, cancellationToken)).ConfigureAwait(false);
+				await (InitializeEntitiesAndCollectionsAsync(hydratedObjects, rs, session, queryParameters.IsReadOnly(session), cancellationToken: cancellationToken)).ConfigureAwait(false);
 
 				if (createSubselects)
 				{
@@ -336,7 +334,7 @@ private async Task<IList> DoQueryAsync(ISessionImplementor session, QueryParamet
 
 		internal async Task InitializeEntitiesAndCollectionsAsync(
 			IList hydratedObjects, object resultSetId, ISessionImplementor session, bool readOnly,
-			CacheBatcher cacheBatcher, CancellationToken cancellationToken)
+			CacheBatcher cacheBatcher = null, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			ICollectionPersister[] collectionPersisters = CollectionPersisters;
diff --git a/src/NHibernate/Impl/MultiCriteriaImpl.cs b/src/NHibernate/Impl/MultiCriteriaImpl.cs
@@ -271,8 +271,7 @@ private void GetResultsFromDatabase(IList results)
 					for (int i = 0; i < loaders.Count; i++)
 					{
 						CriteriaLoader loader = loaders[i];
-						loader.InitializeEntitiesAndCollections(
-							hydratedObjects[i], reader, session, session.DefaultReadOnly, null);
+						loader.InitializeEntitiesAndCollections(hydratedObjects[i], reader, session, session.DefaultReadOnly);
 
 						if (createSubselects[i])
 						{
diff --git a/src/NHibernate/Impl/MultiQueryImpl.cs b/src/NHibernate/Impl/MultiQueryImpl.cs
@@ -614,8 +614,7 @@ protected List<object> DoList()
 						ITranslator translator = translators[i];
 						QueryParameters parameter = parameters[i];
 
-						translator.Loader.InitializeEntitiesAndCollections(
-							hydratedObjects[i], reader, session, false, null);
+						translator.Loader.InitializeEntitiesAndCollections(hydratedObjects[i], reader, session, false);
 
 						if (createSubselects[i])
 						{
diff --git a/src/NHibernate/Loader/Loader.cs b/src/NHibernate/Loader/Loader.cs
@@ -315,8 +315,7 @@ protected object LoadSingleRow(DbDataReader resultSet, ISessionImplementor sessi
 												 queryParameters.NamedParameters);
 			}
 
-			InitializeEntitiesAndCollections(
-				hydratedObjects, resultSet, session, queryParameters.IsReadOnly(session), null);
+			InitializeEntitiesAndCollections(hydratedObjects, resultSet, session, queryParameters.IsReadOnly(session));
 			session.PersistenceContext.InitializeNonLazyCollections();
 			return result;
 		}
@@ -518,8 +517,7 @@ private IList DoQuery(ISessionImplementor session, QueryParameters queryParamete
 					session.Batcher.CloseCommand(st, rs);
 				}
 
-				InitializeEntitiesAndCollections(
-					hydratedObjects, rs, session, queryParameters.IsReadOnly(session), null);
+				InitializeEntitiesAndCollections(hydratedObjects, rs, session, queryParameters.IsReadOnly(session));
 
 				if (createSubselects)
 				{
@@ -603,7 +601,7 @@ private IEnumerable<SubselectFetch> CreateSubselects(IList<EntityKey[]> keys, Qu
 
 		internal void InitializeEntitiesAndCollections(
 			IList hydratedObjects, object resultSetId, ISessionImplementor session, bool readOnly,
-			CacheBatcher cacheBatcher)
+			CacheBatcher cacheBatcher = null)
 		{
 			ICollectionPersister[] collectionPersisters = CollectionPersisters;
 			if (collectionPersisters != null)
diff --git a/src/NHibernate/Multi/QueryBatchExtensions.cs b/src/NHibernate/Multi/QueryBatchExtensions.cs
@@ -567,7 +567,7 @@ public IList<TResult> Value
 			}
 		}
 
-		class FutureEnumerable<TResult> : IFutureEnumerable<TResult>
+		partial class FutureEnumerable<TResult> : IFutureEnumerable<TResult>
 		{
 			private readonly IFutureList<TResult> _result;
 

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ public async Task SerializationAsync()`
`304`	`304`	`var transformer = Transformers.AliasToBean<T>();`
`305`	`305`	`var bytes = SerializationHelper.Serialize(transformer);`
`306`	`306`	`transformer = (IResultTransformer)SerializationHelper.Deserialize(bytes);`
`307`		`- return AssertCardinalityNameAndIdAsync<T>(transformer: transformer, cancellationToken:cancellationToken);`
	`307`	`+ return AssertCardinalityNameAndIdAsync<T>(transformer: transformer, cancellationToken: cancellationToken);`
`308`	`308`	`}`
`309`	`309`	`catch (System.Exception ex)`
`310`	`310`	`{`
Original file line number	Diff line number	Diff line change
`@@ -200,8 +200,7 @@ private async Task GetResultsFromDatabaseAsync(IList results, CancellationToken`
`200`	`200`	`for (int i = 0; i < loaders.Count; i++)`
`201`	`201`	`{`
`202`	`202`	`CriteriaLoader loader = loaders[i];`
`203`		`- await (loader.InitializeEntitiesAndCollectionsAsync(`
`204`		`- hydratedObjects[i], reader, session, session.DefaultReadOnly, null, cancellationToken)).ConfigureAwait(false);`
	`203`	`+ await (loader.InitializeEntitiesAndCollectionsAsync(hydratedObjects[i], reader, session, session.DefaultReadOnly, cancellationToken: cancellationToken)).ConfigureAwait(false);`
`205`	`204`
`206`	`205`	`if (createSubselects[i])`
`207`	`206`	`{`
Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,7 @@ protected async Task<List<object>> DoListAsync(CancellationToken cancellationTok`
`172`	`172`	`ITranslator translator = translators[i];`
`173`	`173`	`QueryParameters parameter = parameters[i];`
`174`	`174`
`175`		`- await (translator.Loader.InitializeEntitiesAndCollectionsAsync(`
`176`		`- hydratedObjects[i], reader, session, false, null, cancellationToken)).ConfigureAwait(false);`
	`175`	`+ await (translator.Loader.InitializeEntitiesAndCollectionsAsync(hydratedObjects[i], reader, session, false, cancellationToken: cancellationToken)).ConfigureAwait(false);`
`177`	`176`
`178`	`177`	`if (createSubselects[i])`
`179`	`178`	`{`
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,7 @@ protected async Task<object> LoadSingleRowAsync(DbDataReader resultSet, ISession`
`129`	`129`	`queryParameters.NamedParameters);`
`130`	`130`	`}`
`131`	`131`
`132`		`- await (InitializeEntitiesAndCollectionsAsync(`
`133`		`- hydratedObjects, resultSet, session, queryParameters.IsReadOnly(session), null, cancellationToken)).ConfigureAwait(false);`
	`132`	`+ await (InitializeEntitiesAndCollectionsAsync(hydratedObjects, resultSet, session, queryParameters.IsReadOnly(session), cancellationToken: cancellationToken)).ConfigureAwait(false);`
`134`	`133`	`await (session.PersistenceContext.InitializeNonLazyCollectionsAsync(cancellationToken)).ConfigureAwait(false);`
`135`	`134`	`return result;`
`136`	`135`	`}`
`@@ -322,8 +321,7 @@ private async Task<IList> DoQueryAsync(ISessionImplementor session, QueryParamet`
`322`	`321`	`session.Batcher.CloseCommand(st, rs);`
`323`	`322`	`}`
`324`	`323`
`325`		`- await (InitializeEntitiesAndCollectionsAsync(`
`326`		`- hydratedObjects, rs, session, queryParameters.IsReadOnly(session), null, cancellationToken)).ConfigureAwait(false);`
	`324`	`+ await (InitializeEntitiesAndCollectionsAsync(hydratedObjects, rs, session, queryParameters.IsReadOnly(session), cancellationToken: cancellationToken)).ConfigureAwait(false);`
`327`	`325`
`328`	`326`	`if (createSubselects)`
`329`	`327`	`{`
`@@ -336,7 +334,7 @@ private async Task<IList> DoQueryAsync(ISessionImplementor session, QueryParamet`
`336`	`334`
`337`	`335`	`internal async Task InitializeEntitiesAndCollectionsAsync(`
`338`	`336`	`IList hydratedObjects, object resultSetId, ISessionImplementor session, bool readOnly,`
`339`		`- CacheBatcher cacheBatcher, CancellationToken cancellationToken)`
	`337`	`+ CacheBatcher cacheBatcher = null, CancellationToken cancellationToken = default(CancellationToken))`
`340`	`338`	`{`
`341`	`339`	`cancellationToken.ThrowIfCancellationRequested();`
`342`	`340`	`ICollectionPersister[] collectionPersisters = CollectionPersisters;`
Original file line number	Diff line number	Diff line change
`@@ -271,8 +271,7 @@ private void GetResultsFromDatabase(IList results)`
`271`	`271`	`for (int i = 0; i < loaders.Count; i++)`
`272`	`272`	`{`
`273`	`273`	`CriteriaLoader loader = loaders[i];`
`274`		`- loader.InitializeEntitiesAndCollections(`
`275`		`- hydratedObjects[i], reader, session, session.DefaultReadOnly, null);`
	`274`	`+ loader.InitializeEntitiesAndCollections(hydratedObjects[i], reader, session, session.DefaultReadOnly);`
`276`	`275`
`277`	`276`	`if (createSubselects[i])`
`278`	`277`	`{`
Original file line number	Diff line number	Diff line change
`@@ -614,8 +614,7 @@ protected List<object> DoList()`
`614`	`614`	`ITranslator translator = translators[i];`
`615`	`615`	`QueryParameters parameter = parameters[i];`
`616`	`616`
`617`		`- translator.Loader.InitializeEntitiesAndCollections(`
`618`		`- hydratedObjects[i], reader, session, false, null);`
	`617`	`+ translator.Loader.InitializeEntitiesAndCollections(hydratedObjects[i], reader, session, false);`
`619`	`618`
`620`	`619`	`if (createSubselects[i])`
`621`	`620`	`{`
Original file line number	Diff line number	Diff line change
`@@ -315,8 +315,7 @@ protected object LoadSingleRow(DbDataReader resultSet, ISessionImplementor sessi`
`315`	`315`	`queryParameters.NamedParameters);`
`316`	`316`	`}`
`317`	`317`
`318`		`- InitializeEntitiesAndCollections(`
`319`		`- hydratedObjects, resultSet, session, queryParameters.IsReadOnly(session), null);`
	`318`	`+ InitializeEntitiesAndCollections(hydratedObjects, resultSet, session, queryParameters.IsReadOnly(session));`
`320`	`319`	`session.PersistenceContext.InitializeNonLazyCollections();`
`321`	`320`	`return result;`
`322`	`321`	`}`
`@@ -518,8 +517,7 @@ private IList DoQuery(ISessionImplementor session, QueryParameters queryParamete`
`518`	`517`	`session.Batcher.CloseCommand(st, rs);`
`519`	`518`	`}`
`520`	`519`
`521`		`- InitializeEntitiesAndCollections(`
`522`		`- hydratedObjects, rs, session, queryParameters.IsReadOnly(session), null);`
	`520`	`+ InitializeEntitiesAndCollections(hydratedObjects, rs, session, queryParameters.IsReadOnly(session));`
`523`	`521`
`524`	`522`	`if (createSubselects)`
`525`	`523`	`{`
`@@ -603,7 +601,7 @@ private IEnumerable<SubselectFetch> CreateSubselects(IList<EntityKey[]> keys, Qu`
`603`	`601`
`604`	`602`	`internal void InitializeEntitiesAndCollections(`
`605`	`603`	`IList hydratedObjects, object resultSetId, ISessionImplementor session, bool readOnly,`
`606`		`- CacheBatcher cacheBatcher)`
	`604`	`+ CacheBatcher cacheBatcher = null)`
`607`	`605`	`{`
`608`	`606`	`ICollectionPersister[] collectionPersisters = CollectionPersisters;`
`609`	`607`	`if (collectionPersisters != null)`
Original file line number	Diff line number	Diff line change
`@@ -567,7 +567,7 @@ public IList<TResult> Value`
`567`	`567`	`}`
`568`	`568`	`}`
`569`	`569`
`570`		`- class FutureEnumerable<TResult> : IFutureEnumerable<TResult>`
	`570`	`+ partial class FutureEnumerable<TResult> : IFutureEnumerable<TResult>`
`571`	`571`	`{`
`572`	`572`	`private readonly IFutureList<TResult> _result;`
`573`	`573`