Proper iteration in HQLQueryPlan.PerformIterate

Author: bahusoid

src/NHibernate.Test/Async/Legacy/FooBarTest.cs

@@ -28,6 +28,7 @@
 using NHibernate.Type;
 using NHibernate.Util;
 using NUnit.Framework;
+using System.Linq;
 
 namespace NHibernate.Test.Legacy
 {
@@ -1228,8 +1229,7 @@ public async Task BatchLoadAsync()
 				await (s.DeleteAsync(baz2));
 				await (s.DeleteAsync(baz3));
 
-				IEnumerable en = new JoinedEnumerable(
-					new IEnumerable[] {baz.FooSet, baz2.FooSet});
+				IEnumerable en = Enumerable.Concat(baz.FooSet, baz2.FooSet);
 
 				foreach (object obj in en)
 				{
@@ -3459,7 +3459,7 @@ public async Task PersistentLifecycleAsync()
 
 
 		[Test]
-		public async Task EnumerableAsync()
+		public async Task EnumerableTestAsync()
 		{
 			// this test used to be called Iterators()
 
@@ -5338,10 +5338,9 @@ public async Task TransientOrphanDeleteAsync()
 			baz.FooBag = foos;
 			await (s.SaveAsync(baz));
 
-			IEnumerator enumer = new JoinedEnumerable(new IEnumerable[] {foos, bars}).GetEnumerator();
-			while (enumer.MoveNext())
+			foreach(Foo foo in Enumerable.Concat<object>(foos, bars))
 			{
-				FooComponent cmp = ((Foo) enumer.Current).Component;
+				FooComponent cmp = foo.Component;
 				await (s.DeleteAsync(cmp.Glarch));
 				cmp.Glarch = null;
 			}

src/NHibernate.Test/Legacy/FooBarTest.cs

@@ -18,6 +18,7 @@
 using NHibernate.Type;
 using NHibernate.Util;
 using NUnit.Framework;
+using System.Linq;
 
 namespace NHibernate.Test.Legacy
 {
@@ -1216,8 +1217,7 @@ public void BatchLoad()
 				s.Delete(baz2);
 				s.Delete(baz3);
 
-				IEnumerable en = new JoinedEnumerable(
-					new IEnumerable[] {baz.FooSet, baz2.FooSet});
+				IEnumerable en = Enumerable.Concat(baz.FooSet, baz2.FooSet);
 
 				foreach (object obj in en)
 				{
@@ -3447,7 +3447,7 @@ public void PersistentLifecycle()
 
 
 		[Test]
-		public void Enumerable()
+		public void EnumerableTest()
 		{
 			// this test used to be called Iterators()
 
@@ -5326,10 +5326,9 @@ public void TransientOrphanDelete()
 			baz.FooBag = foos;
 			s.Save(baz);
 
-			IEnumerator enumer = new JoinedEnumerable(new IEnumerable[] {foos, bars}).GetEnumerator();
-			while (enumer.MoveNext())
+			foreach(Foo foo in Enumerable.Concat<object>(foos, bars))
 			{
-				FooComponent cmp = ((Foo) enumer.Current).Component;
+				FooComponent cmp = foo.Component;
 				s.Delete(cmp.Glarch);
 				cmp.Glarch = null;
 			}

src/NHibernate.Test/UtilityTest/JoinedEnumerableFixture.cs

@@ -11,7 +11,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-
+using System.Linq;
 using NHibernate.Event;
 using NHibernate.Hql;
 using NHibernate.Linq;
@@ -26,8 +26,6 @@ public partial interface IQueryPlan
     {
         Task PerformListAsync(QueryParameters queryParameters, ISessionImplementor statelessSessionImpl, IList results, CancellationToken cancellationToken);
         Task<int> PerformExecuteUpdateAsync(QueryParameters queryParameters, ISessionImplementor statelessSessionImpl, CancellationToken cancellationToken);
-        Task<IEnumerable<T>> PerformIterateAsync<T>(QueryParameters queryParameters, IEventSource session, CancellationToken cancellationToken);
-        Task<IEnumerable> PerformIterateAsync(QueryParameters queryParameters, IEventSource session, CancellationToken cancellationToken);
     }
 	public partial class HQLQueryPlan : IQueryPlan
 	{
@@ -100,37 +98,6 @@ public async Task PerformListAsync(QueryParameters queryParameters, ISessionImpl
 			}
 		}
 
-		public async Task<IEnumerable> PerformIterateAsync(QueryParameters queryParameters, IEventSource session, CancellationToken cancellationToken)
-		{
-			cancellationToken.ThrowIfCancellationRequested();
-			if (Log.IsDebugEnabled())
-			{
-				Log.Debug("enumerable: {0}", _sourceQuery);
-				queryParameters.LogParameters(session.Factory);
-			}
-			if (Translators.Length == 0)
-			{
-				return CollectionHelper.EmptyEnumerable;
-			}
-			if (Translators.Length == 1)
-			{
-				return await (Translators[0].GetEnumerableAsync(queryParameters, session, cancellationToken)).ConfigureAwait(false);
-			}
-			var results = new IEnumerable[Translators.Length];
-			for (int i = 0; i < Translators.Length; i++)
-			{
-				var result = await (Translators[i].GetEnumerableAsync(queryParameters, session, cancellationToken)).ConfigureAwait(false);
-				results[i] = result;
-			}
-			return new JoinedEnumerable(results);
-		}
-
-		public async Task<IEnumerable<T>> PerformIterateAsync<T>(QueryParameters queryParameters, IEventSource session, CancellationToken cancellationToken)
-		{
-			cancellationToken.ThrowIfCancellationRequested();
-			return new SafetyEnumerable<T>(await (PerformIterateAsync(queryParameters, session, cancellationToken)).ConfigureAwait(false));
-		}
-
         public async Task<int> PerformExecuteUpdateAsync(QueryParameters queryParameters, ISessionImplementor session, CancellationToken cancellationToken)
         {
                cancellationToken.ThrowIfCancellationRequested();

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

@@ -310,7 +310,7 @@ public override async Task<IEnumerable<T>> EnumerableAsync<T>(IQueryExpression q
 
 				using (SuspendAutoFlush()) //stops flush being called multiple times if this method is recursively called
 				{
-					return await (plan.PerformIterateAsync<T>(queryParameters, this, cancellationToken)).ConfigureAwait(false);
+					return plan.PerformIterate<T>(queryParameters, this);
 				}
 			}
 		}
@@ -326,7 +326,7 @@ public override async Task<IEnumerable> EnumerableAsync(IQueryExpression queryEx
 
 				using (SuspendAutoFlush()) //stops flush being called multiple times if this method is recursively called
 				{
-					return await (plan.PerformIterateAsync(queryParameters, this, cancellationToken)).ConfigureAwait(false);
+					return plan.PerformIterate(queryParameters, this);
 				}
 			}
 		}
@@ -1108,7 +1108,7 @@ public override async Task<IEnumerable> EnumerableFilterAsync(object collection,
 			using (BeginProcess())
 			{
 				var plan = await (GetFilterQueryPlanAsync(collection, filter, queryParameters, true, cancellationToken)).ConfigureAwait(false);
-				return await (plan.PerformIterateAsync(queryParameters, this, cancellationToken)).ConfigureAwait(false);
+				return plan.PerformIterate(queryParameters, this);
 			}
 		}
 
@@ -1118,7 +1118,7 @@ public override async Task<IEnumerable<T>> EnumerableFilterAsync<T>(object colle
 			using (BeginProcess())
 			{
 				var plan = await (GetFilterQueryPlanAsync(collection, filter, queryParameters, true, cancellationToken)).ConfigureAwait(false);
-				return await (plan.PerformIterateAsync<T>(queryParameters, this, cancellationToken)).ConfigureAwait(false);
+				return plan.PerformIterate<T>(queryParameters, this);
 			}
 		}