Regenerate async

Author: hazzik

src/NHibernate/Async/Engine/Query/HQLQueryPlan.cs

@@ -25,6 +25,8 @@ public partial interface IQueryPlan
     {
         Task PerformListAsync(QueryParameters queryParameters, ISessionImplementor statelessSessionImpl, IList results);
         Task<int> PerformExecuteUpdateAsync(QueryParameters queryParameters, ISessionImplementor statelessSessionImpl);
+        Task<IEnumerable<T>> PerformIterateAsync<T>(QueryParameters queryParameters, IEventSource session);
+        Task<IEnumerable> PerformIterateAsync(QueryParameters queryParameters, IEventSource session);
     }
 	public partial class HQLQueryPlan : IQueryPlan
 	{
@@ -96,6 +98,35 @@ public async Task PerformListAsync(QueryParameters queryParameters, ISessionImpl
 			}
 		}
 
+		public async Task<IEnumerable> PerformIterateAsync(QueryParameters queryParameters, IEventSource session)
+		{
+			if (Log.IsDebugEnabled)
+			{
+				Log.Debug("enumerable: " + _sourceQuery);
+				queryParameters.LogParameters(session.Factory);
+			}
+			if (Translators.Length == 0)
+			{
+				return CollectionHelper.EmptyEnumerable;
+			}
+			if (Translators.Length == 1)
+			{
+				return await (Translators[0].GetEnumerableAsync(queryParameters, session)).ConfigureAwait(false);
+			}
+			var results = new IEnumerable[Translators.Length];
+			for (int i = 0; i < Translators.Length; i++)
+			{
+				var result = await (Translators[i].GetEnumerableAsync(queryParameters, session)).ConfigureAwait(false);
+				results[i] = result;
+			}
+			return new JoinedEnumerable(results);
+		}
+
+		public async Task<IEnumerable<T>> PerformIterateAsync<T>(QueryParameters queryParameters, IEventSource session)
+		{
+			return new SafetyEnumerable<T>(await (PerformIterateAsync(queryParameters, session)).ConfigureAwait(false));
+		}
+
         public async Task<int> PerformExecuteUpdateAsync(QueryParameters queryParameters, ISessionImplementor session)
         {
             if (Log.IsDebugEnabled)

src/NHibernate/Async/Impl/SessionImpl.cs

@@ -250,7 +250,7 @@ public override async Task<IEnumerable<T>> EnumerableAsync<T>(IQueryExpression q
 				dontFlushFromFind++; //stops flush being called multiple times if this method is recursively called
 				try
 				{
-					return plan.PerformIterate<T>(queryParameters, this);
+					return await (plan.PerformIterateAsync<T>(queryParameters, this)).ConfigureAwait(false);
 				}
 				finally
 				{
@@ -271,7 +271,7 @@ public override async Task<IEnumerable> EnumerableAsync(IQueryExpression queryEx
 				dontFlushFromFind++; //stops flush being called multiple times if this method is recursively called
 				try
 				{
-					return plan.PerformIterate(queryParameters, this);
+					return await (plan.PerformIterateAsync(queryParameters, this)).ConfigureAwait(false);
 				}
 				finally
 				{
@@ -1045,7 +1045,7 @@ public override async Task<IEnumerable> EnumerableFilterAsync(object collection,
 			{
 				CheckAndUpdateSessionStatus();
 				FilterQueryPlan plan = await (GetFilterQueryPlanAsync(collection, filter, queryParameters, true)).ConfigureAwait(false);
-				return plan.PerformIterate(queryParameters, this);
+				return await (plan.PerformIterateAsync(queryParameters, this)).ConfigureAwait(false);
 			}
 		}
 
@@ -1055,7 +1055,7 @@ public override async Task<IEnumerable<T>> EnumerableFilterAsync<T>(object colle
 			{
 				CheckAndUpdateSessionStatus();
 				FilterQueryPlan plan = await (GetFilterQueryPlanAsync(collection, filter, queryParameters, true)).ConfigureAwait(false);
-				return plan.PerformIterate<T>(queryParameters, this);
+				return await (plan.PerformIterateAsync<T>(queryParameters, this)).ConfigureAwait(false);
 			}
 		}