async QueryBatchItemBase.ProcessResults

Author: bahusoid

src/NHibernate/Async/Multi/IQueryBatchItem.cs

@@ -36,4 +36,9 @@ public partial interface IQueryBatchItem
 		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
 		Task ExecuteNonBatchedAsync(CancellationToken cancellationToken);
 	}
+
+	internal partial interface IQueryBatchItemWithAsyncProcessResults
+	{
+		Task ProcessResultsAsync(CancellationToken cancellationToken);
+	}
 }

src/NHibernate/Async/Multi/QueryBatch.cs

@@ -156,7 +156,11 @@ protected async Task ExecuteBatchedAsync(CancellationToken cancellationToken)
 
 				foreach (var query in _queries)
 				{
-					query.ProcessResults();
+					//TODO 6.0: Replace with query.ProcessResults();
+					if (query is IQueryBatchItemWithAsyncProcessResults q)
+						await (q.ProcessResultsAsync(cancellationToken)).ConfigureAwait(false);
+					else
+						query.ProcessResults();
 				}
 			}
 			catch (OperationCanceledException) { throw; }

src/NHibernate/Async/Multi/QueryBatchItemBase.cs

@@ -23,7 +23,7 @@ namespace NHibernate.Multi
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public abstract partial class QueryBatchItemBase<TResult> : IQueryBatchItem<TResult>
+	public abstract partial class QueryBatchItemBase<TResult> : IQueryBatchItem<TResult>, IQueryBatchItemWithAsyncProcessResults
 	{
 
 		/// <inheritdoc />
@@ -115,6 +115,32 @@ public async Task<int> ProcessResultsSetAsync(DbDataReader reader, CancellationT
 			}
 		}
 
+		/// <inheritdoc cref="IQueryBatchItem.ProcessResults" />
+		public async Task ProcessResultsAsync(CancellationToken cancellationToken)
+		{
+			cancellationToken.ThrowIfCancellationRequested();
+			ThrowIfNotInitialized();
+
+			await (InitializeEntitiesAndCollectionsAsync(_reader, _hydratedObjects, cancellationToken)).ConfigureAwait(false);
+			for (var i = 0; i < _queryInfos.Count; i++)
+			{
+				var queryInfo = _queryInfos[i];
+				if (_subselectResultKeys[i] != null)
+				{
+					queryInfo.Loader.CreateSubselects(_subselectResultKeys[i], queryInfo.Parameters, Session);
+				}
+
+				if (queryInfo.IsCacheable)
+				{
+					// This transformation must not be applied to ResultToCache.
+					queryInfo.Result =
+						queryInfo.Loader.TransformCacheableResults(
+							queryInfo.Parameters, queryInfo.CacheKey.ResultTransformer, queryInfo.Result);
+				}
+			}
+			AfterLoadCallback?.Invoke(GetResults());
+		}
+
 		/// <inheritdoc />
 		public async Task ExecuteNonBatchedAsync(CancellationToken cancellationToken)
 		{
@@ -124,5 +150,19 @@ public async Task ExecuteNonBatchedAsync(CancellationToken cancellationToken)
 		}
 
 		protected abstract Task<IList<TResult>> GetResultsNonBatchedAsync(CancellationToken cancellationToken);
+
+		private async Task InitializeEntitiesAndCollectionsAsync(DbDataReader reader, List<object>[] hydratedObjects, CancellationToken cancellationToken)
+		{
+			cancellationToken.ThrowIfCancellationRequested();
+			for (var i = 0; i < _queryInfos.Count; i++)
+			{
+				var queryInfo = _queryInfos[i];
+				if (queryInfo.IsResultFromCache)
+					continue;
+				await (queryInfo.Loader.InitializeEntitiesAndCollectionsAsync(
+					hydratedObjects[i], reader, Session, queryInfo.Parameters.IsReadOnly(Session),
+					queryInfo.CacheBatcher, cancellationToken)).ConfigureAwait(false);
+			}
+		}
 	}
 }

src/NHibernate/Multi/IQueryBatchItem.cs

@@ -80,4 +80,10 @@ public partial interface IQueryBatchItem
 		/// </summary>
 		void ExecuteNonBatched();
 	}
+
+	//TODO 6.0: Remove along with ignore rule for IQueryBatchItem.ProcessResults in AsyncGenerator.yml
+	internal partial interface IQueryBatchItemWithAsyncProcessResults
+	{
+		void ProcessResults();
+	}
 }

src/NHibernate/Multi/QueryBatch.cs

@@ -182,7 +182,11 @@ protected void ExecuteBatched()
 
 				foreach (var query in _queries)
 				{
-					query.ProcessResults();
+					//TODO 6.0: Replace with query.ProcessResults();
+					if (query is IQueryBatchItemWithAsyncProcessResults q)
+						q.ProcessResults();
+					else
+						query.ProcessResults();
 				}
 			}
 			catch (Exception sqle)

src/NHibernate/Multi/QueryBatchItemBase.cs

@@ -14,7 +14,7 @@ namespace NHibernate.Multi
 	/// <summary>
 	/// Base class for both ICriteria and IQuery queries
 	/// </summary>
-	public abstract partial class QueryBatchItemBase<TResult> : IQueryBatchItem<TResult>
+	public abstract partial class QueryBatchItemBase<TResult> : IQueryBatchItem<TResult>, IQueryBatchItemWithAsyncProcessResults
 	{
 		protected ISessionImplementor Session;
 		private List<EntityKey[]>[] _subselectResultKeys;
@@ -256,7 +256,7 @@ public int ProcessResultsSet(DbDataReader reader)
 			}
 		}
 
-		/// <inheritdoc />
+		/// <inheritdoc cref="IQueryBatchItem.ProcessResults" />
 		public void ProcessResults()
 		{
 			ThrowIfNotInitialized();