Refactoring

Author: hazzik

src/NHibernate/Linq/GroupBy/NonAggregatingGroupByRewriter.cs

@@ -22,7 +22,7 @@ public static void ReWrite(QueryModel queryModel)
 				for (var index = 0; index < queryModel.ResultOperators.Count; index++)
 				{
 					var r = (GroupResultOperator) queryModel.ResultOperators[index];
-					queryModel.ResultOperators[index] = new NonAggregatingGroupBy(r, source);
+					queryModel.ResultOperators[index] = new NonAggregatingGroupBy(r);
 					source = new QuerySourceReferenceExpression(r);
 				}
 
@@ -62,7 +62,7 @@ private static void FlattenSubQuery(SubQueryExpression subQueryExpression, Query
 				throw new NotImplementedException();
 			}
 
-			queryModel.ResultOperators.Add(new NonAggregatingGroupBy((GroupResultOperator) subQueryModel.ResultOperators[0], queryModel.SelectClause.Selector));
+			queryModel.ResultOperators.Add(new NonAggregatingGroupBy((GroupResultOperator) subQueryModel.ResultOperators[0]));
 			queryModel.ResultOperators.Add(clientSideSelect);
 		}
 

src/NHibernate/Linq/ResultOperators/NonAggregatingGroupBy.cs

@@ -1,25 +1,18 @@
-using System;
-using System.Linq.Expressions;
 using Remotion.Linq.Clauses.ResultOperators;
+using Remotion.Linq.Clauses.StreamedData;
 
 namespace NHibernate.Linq.ResultOperators
 {
 	public class NonAggregatingGroupBy : ClientSideTransformOperator
 	{
-		//Since v5.4
-		[Obsolete("Please use another constructor")]
-		public NonAggregatingGroupBy(GroupResultOperator groupBy) : this(groupBy, null)
-		{
-		}
-
-		public NonAggregatingGroupBy(GroupResultOperator groupBy, Expression source)
+		public NonAggregatingGroupBy(GroupResultOperator groupBy)
 		{
 			GroupBy = groupBy;
-			Source = source;
 		}
 
 		public GroupResultOperator GroupBy { get; }
 
-		public Expression Source { get; }
+		public override IStreamedDataInfo GetOutputDataInfo(IStreamedDataInfo inputInfo) => 
+			GroupBy.GetOutputDataInfo(inputInfo);
 	}
 }

src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessNonAggregatingGroupBy.cs

@@ -4,14 +4,15 @@
 using NHibernate.Linq.ResultOperators;
 using NHibernate.Util;
 using Remotion.Linq.Clauses.ExpressionVisitors;
+using Remotion.Linq.Clauses.StreamedData;
 
 namespace NHibernate.Linq.Visitors.ResultOperatorProcessors
 {
 	public class ProcessNonAggregatingGroupBy : IResultOperatorProcessor<NonAggregatingGroupBy>
 	{
 		public void Process(NonAggregatingGroupBy resultOperator, QueryModelVisitor queryModelVisitor, IntermediateHqlTree tree)
 		{
-			var selector = resultOperator.Source;
+			var selector = ((StreamedSequenceInfo) queryModelVisitor.PreviousEvaluationType).ItemExpression;
 			var keySelector = resultOperator.GroupBy.KeySelector;
 			var elementSelector = resultOperator.GroupBy.ElementSelector;