Rename ProjectionExpression.Apply(ItemProjectorExpression) -> ApplyItemProjector

alex-kulakov · alex-kulakov · commit 8a03ac080b3d · 2024-06-17T16:01:06.000+05:00
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Expressions/GroupingExpression.cs b/Orm/Xtensive.Orm/Orm/Linq/Expressions/GroupingExpression.cs
@@ -90,7 +90,7 @@ public override Expression ReplaceApplyParameter(ApplyParameter newApplyParamete
         return new GroupingExpression(Type, OuterParameter, DefaultIfEmpty, ProjectionExpression, ApplyParameter, KeyExpression, SelectManyInfo);
 
       var newItemProjector = ProjectionExpression.ItemProjector.RewriteApplyParameter(ApplyParameter, newApplyParameter);
-      var newProjectionExpression = ProjectionExpression.Apply(newItemProjector);
+      var newProjectionExpression = ProjectionExpression.ApplyItemProjector(newItemProjector);
       return new GroupingExpression(Type, OuterParameter, DefaultIfEmpty, newProjectionExpression, newApplyParameter, KeyExpression, SelectManyInfo);
     }
 
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Expressions/ProjectionExpression.cs b/Orm/Xtensive.Orm/Orm/Linq/Expressions/ProjectionExpression.cs
@@ -21,7 +21,14 @@ internal class ProjectionExpression : ExtendedExpression
 
     public override string ToString() => $"Projection:  {ItemProjector}, IsScalar = {IsScalar}";
 
-    public ProjectionExpression Apply(ItemProjectorExpression itemProjectorExpression) =>
+    /// <summary>
+    /// Creates new <see cref="ProjectionExpression"/> based on this instance. New projection
+    /// inherits all properties but <see cref="ProjectionExpression.ItemProjector"/>, which is
+    /// replaced by the given <paramref name="itemProjectorExpression"/>.
+    /// </summary>
+    /// <param name="itemProjectorExpression">Replacement of <see cref="ProjectionExpression.ItemProjector"/>.</param>
+    /// <returns>New instance with replaced item projector.</returns>
+    public ProjectionExpression ApplyItemProjector(ItemProjectorExpression itemProjectorExpression) =>
       new ProjectionExpression(Type, itemProjectorExpression, TupleParameterBindings, ResultAccessMethod);
 
     // Constructors
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Expressions/SubQueryExpression.cs b/Orm/Xtensive.Orm/Orm/Linq/Expressions/SubQueryExpression.cs
@@ -109,7 +109,7 @@ public virtual Expression ReplaceApplyParameter(ApplyParameter newApplyParameter
         return new SubQueryExpression(Type, OuterParameter, DefaultIfEmpty, ProjectionExpression, ApplyParameter);
       
       var newItemProjector = ProjectionExpression.ItemProjector.RewriteApplyParameter(ApplyParameter, newApplyParameter);
-      var newProjectionExpression = ProjectionExpression.Apply(newItemProjector);
+      var newProjectionExpression = ProjectionExpression.ApplyItemProjector(newItemProjector);
       return new SubQueryExpression(Type, OuterParameter, DefaultIfEmpty, newProjectionExpression, newApplyParameter);
     }
 
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Expressions/Visitors/ExtendedExpressionReplacer.cs b/Orm/Xtensive.Orm/Orm/Linq/Expressions/Visitors/ExtendedExpressionReplacer.cs
@@ -38,7 +38,7 @@ protected override Expression VisitProjectionExpression(ProjectionExpression pro
       var itemChanged = item != projectionExpression.ItemProjector.Item;
       if (providerChanged || itemChanged) {
         var itemProjector = new ItemProjectorExpression(item, provider, projectionExpression.ItemProjector.Context);
-        return projectionExpression.Apply(itemProjector);
+        return projectionExpression.ApplyItemProjector(itemProjector);
       }
       return projectionExpression;
     }
diff --git a/Orm/Xtensive.Orm/Orm/Linq/LinqBindingCollection.cs b/Orm/Xtensive.Orm/Orm/Linq/LinqBindingCollection.cs
@@ -66,7 +66,7 @@ public override void ReplaceBound(ParameterExpression key, ProjectionExpression
           if (parameter!=key) {
             var projection = this[parameter];
             var newItemProjector = projection.ItemProjector.Remap(value.ItemProjector.DataSource, 0);
-            var newProjection = projection.Apply(newItemProjector);
+            var newProjection = projection.ApplyItemProjector(newItemProjector);
             base.ReplaceBound(parameter, newProjection);
           }
         }
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Materialization/ExpressionMaterializer.cs b/Orm/Xtensive.Orm/Orm/Linq/Materialization/ExpressionMaterializer.cs
@@ -193,7 +193,7 @@ private TranslatedQuery PrepareSubqueryParameters(SubQueryExpression subQueryExp
 
       // 2. Add only parameter<tuple>. Tuple value will be assigned
       // at the moment of materialization in SubQuery constructor
-      projection = projectionExpression.Apply(itemProjector);
+      projection = projectionExpression.ApplyItemProjector(itemProjector);
 
       // 3. Make translation 
       elementType = projectionExpression.ItemProjector.Item.Type;
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Rewriters/ApplyParameterRewriter.cs b/Orm/Xtensive.Orm/Orm/Linq/Rewriters/ApplyParameterRewriter.cs
@@ -48,7 +48,7 @@ protected override Expression VisitGroupingExpression(GroupingExpression express
         || newItemProjectorBody != projectionExpression.ItemProjector.Item
           || newKeyExpression != expression.KeyExpression) {
         var newItemProjector = new ItemProjectorExpression(newItemProjectorBody, newProvider, projectionExpression.ItemProjector.Context);
-        var newProjectionExpression = projectionExpression.Apply(newItemProjector);
+        var newProjectionExpression = projectionExpression.ApplyItemProjector(newItemProjector);
         return new GroupingExpression(
           expression.Type, expression.OuterParameter, expression.DefaultIfEmpty, newProjectionExpression,
           expression.ApplyParameter, expression.KeyExpression, expression.SelectManyInfo);
@@ -65,7 +65,7 @@ protected override Expression VisitSubQueryExpression(SubQueryExpression express
         || newItemProjectorBody != projectionExpression.ItemProjector.Item) {
         var newItemProjector = new ItemProjectorExpression(
           newItemProjectorBody, newProvider, projectionExpression.ItemProjector.Context);
-        var newProjectionExpression = projectionExpression.Apply(newItemProjector);
+        var newProjectionExpression = projectionExpression.ApplyItemProjector(newItemProjector);
         return new SubQueryExpression(
           expression.Type, expression.OuterParameter, expression.DefaultIfEmpty, newProjectionExpression,
           expression.ApplyParameter, expression.ExtendedType);
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Rewriters/ApplyParameterToTupleParameterRewriter.cs b/Orm/Xtensive.Orm/Orm/Linq/Rewriters/ApplyParameterToTupleParameterRewriter.cs
@@ -49,7 +49,7 @@ protected override Expression VisitGroupingExpression(GroupingExpression express
         || newItemProjectorBody != projectionExpression.ItemProjector.Item
           || newKeyExpression != expression.KeyExpression) {
         var newItemProjector = new ItemProjectorExpression(newItemProjectorBody, newProvider, projectionExpression.ItemProjector.Context);
-        var newProjectionExpression = projectionExpression.Apply(newItemProjector);
+        var newProjectionExpression = projectionExpression.ApplyItemProjector(newItemProjector);
         return new GroupingExpression(
           expression.Type, expression.OuterParameter, expression.DefaultIfEmpty,
           newProjectionExpression, expression.ApplyParameter,
@@ -65,7 +65,7 @@ protected override Expression VisitSubQueryExpression(SubQueryExpression express
       var newItemProjectorBody = Visit(projectionExpression.ItemProjector.Item);
       if (newProvider != projectionExpression.ItemProjector.DataSource || newItemProjectorBody != projectionExpression.ItemProjector.Item) {
         var newItemProjector = new ItemProjectorExpression(newItemProjectorBody, newProvider, projectionExpression.ItemProjector.Context);
-        var newProjectionExpression = projectionExpression.Apply(newItemProjector);
+        var newProjectionExpression = projectionExpression.ApplyItemProjector(newItemProjector);
         return new SubQueryExpression(
           expression.Type, expression.OuterParameter,
           expression.DefaultIfEmpty, newProjectionExpression,
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs b/Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs
@@ -706,7 +706,7 @@ protected override Expression VisitNew(NewExpression newExpression)
 
     internal static bool FilterBindings(MemberInfo mi, string name, Type type)
     {
-      var result = String.Equals(mi.Name, name, StringComparison.InvariantCultureIgnoreCase);
+      var result = string.Equals(mi.Name, name, StringComparison.InvariantCultureIgnoreCase);
       if (!result)
         return false;
 
@@ -725,7 +725,8 @@ internal static bool FilterBindings(MemberInfo mi, string name, Type type)
 
     #region Private helper methods
 
-    private Dictionary<MemberInfo, Expression> GetBindingsForConstructor(ParameterInfo[] constructorParameters, IList<Expression> constructorArguments, Expression newExpression)
+    private Dictionary<MemberInfo, Expression> GetBindingsForConstructor(
+      ParameterInfo[] constructorParameters, IList<Expression> constructorArguments, Expression newExpression)
     {
       var bindings = new Dictionary<MemberInfo, Expression>();
       var duplicateMembers = new HashSet<MemberInfo>();
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Translator.Materialization.cs b/Orm/Xtensive.Orm/Orm/Linq/Translator.Materialization.cs
@@ -47,7 +47,7 @@ internal TranslatedQuery Translate(ProjectionExpression projection,
       if (context.SessionTags != null)
         result = ApplySessionTags(result, context.SessionTags);
       var newItemProjector = result.ItemProjector.EnsureEntityIsJoined();
-      result = result.Apply(newItemProjector);
+      result = result.ApplyItemProjector(newItemProjector);
 
       var optimized = Optimize(result);
 
@@ -92,7 +92,7 @@ private static ProjectionExpression Optimize(ProjectionExpression origin)
         var usedColumnsArray = usedColumns.ToArray();
         var resultProvider = new SelectProvider(originProvider, usedColumnsArray);
         var itemProjector = origin.ItemProjector.Remap(resultProvider, usedColumnsArray);
-        var result = origin.Apply(itemProjector);
+        var result = origin.ApplyItemProjector(itemProjector);
         return result;
       }
       return origin;
@@ -115,7 +115,7 @@ private static ProjectionExpression ApplySessionTags(ProjectionExpression origin
         var projector = currentProjection.ItemProjector;
         var newDataSource = projector.DataSource.Tag(tag);
         var newItemProjector = new ItemProjectorExpression(projector.Item, newDataSource, projector.Context);
-        currentProjection = currentProjection.Apply(newItemProjector);
+        currentProjection = currentProjection.ApplyItemProjector(newItemProjector);
       }
       return currentProjection;
     }
@@ -208,7 +208,7 @@ private ProjectionExpression GetIndexBinding(LambdaExpression le, ref Projection
         var indexItemProjector = new ItemProjectorExpression(itemExpression, indexDataSource, context);
         var indexProjectionExpression = new ProjectionExpression(WellKnownTypes.Int64, indexItemProjector, sequence.TupleParameterBindings);
         var sequenceItemProjector = sequence.ItemProjector.Remap(indexDataSource, 0);
-        sequence = sequence.Apply(sequenceItemProjector);
+        sequence = sequence.ApplyItemProjector(sequenceItemProjector);
         return indexProjectionExpression;
       }
       return null;
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Translator.Queryable.cs b/Orm/Xtensive.Orm/Orm/Linq/Translator.Queryable.cs
@@ -264,7 +264,7 @@ private Expression VisitLock(MethodCallExpression expression)
       var newDataSource = visitedSource.ItemProjector.DataSource.Lock(lockMode, lockBehavior);
       var newItemProjector = new ItemProjectorExpression(
         visitedSource.ItemProjector.Item, newDataSource, visitedSource.ItemProjector.Context);
-      var projectionExpression = visitedSource.Apply(newItemProjector);
+      var projectionExpression = visitedSource.ApplyItemProjector(newItemProjector);
       return projectionExpression;
     }
 
@@ -290,11 +290,7 @@ private Expression VisitTag(MethodCallExpression expression)
         : visitedSource.ItemProjector.DataSource;
       var newItemProjector = new ItemProjectorExpression(
         visitedSource.ItemProjector.Item, newDataSource, visitedSource.ItemProjector.Context);
-      var projectionExpression = new ProjectionExpression(
-        visitedSource.Type,
-        newItemProjector,
-        visitedSource.TupleParameterBindings,
-        visitedSource.ResultAccessMethod);
+      var projectionExpression = visitedSource.ApplyItemProjector(newItemProjector);
       return projectionExpression;
     }
 
@@ -349,7 +345,7 @@ private ProjectionExpression VisitCast(Expression source, Type targetType, Type
 
       var visitedSource = VisitSequence(source);
       var itemProjector = visitedSource.ItemProjector.EnsureEntityIsJoined();
-      var projection = visitedSource.Apply(itemProjector);
+      var projection = visitedSource.ApplyItemProjector(itemProjector);
       if (targetType == sourceType) {
         return projection;
       }
@@ -772,14 +768,14 @@ private Expression VisitAggregate(Expression source, MethodInfo method, LambdaEx
               groupingDataSource.GroupColumnIndexes,
               (IReadOnlyList<AggregateColumnDescriptor>) aggregateDescriptors);
             var optimizedItemProjector = groupingProjection.ItemProjector.Remap(resultDataSource, 0);
-            groupingProjection = groupingProjection.Apply(optimizedItemProjector);
+            groupingProjection = groupingProjection.ApplyItemProjector(optimizedItemProjector);
             context.Bindings.ReplaceBound(groupingParameter, groupingProjection);
             var isSubqueryParameter = State.OuterParameters.Contains(groupingParameter);
             if (isSubqueryParameter) {
               var newApplyParameter = context.GetApplyParameter(resultDataSource);
               foreach (var innerParameter in State.Parameters) {
                 var projectionExpression = context.Bindings[innerParameter];
-                var newProjectionExpression = projectionExpression.Apply(projectionExpression.ItemProjector.RewriteApplyParameter(groupingFilterParameter, newApplyParameter));
+                var newProjectionExpression = projectionExpression.ApplyItemProjector(projectionExpression.ItemProjector.RewriteApplyParameter(groupingFilterParameter, newApplyParameter));
                 context.Bindings.ReplaceBound(innerParameter, newProjectionExpression);
               }
             }
@@ -1048,7 +1044,7 @@ private ProjectionExpression VisitGroupBy(Type returnType, Expression source, La
           });
 
       var filter = FastExpression.Lambda(filterBody, tupleParameter);
-      var subqueryProjection = sequence.Apply(new ItemProjectorExpression(
+      var subqueryProjection = sequence.ApplyItemProjector(new ItemProjectorExpression(
           sequence.ItemProjector.Item,
           groupingSourceProjection.ItemProjector.DataSource.Filter((Expression<Func<Tuple, bool>>) filter),
           context));
@@ -1240,7 +1236,7 @@ private Expression VisitGroupJoin(Expression outerSource, Expression innerSource
           newGroupingExpression,
           innerGrouping.ItemProjector.DataSource,
           innerGrouping.ItemProjector.Context);
-        innerGrouping = innerGrouping.Apply(newGroupingItemProjector);
+        innerGrouping = innerGrouping.ApplyItemProjector(newGroupingItemProjector);
       }
 
       var groupingKeyPropertyInfo = groupingType.GetProperty(WellKnown.KeyFieldName);
@@ -1328,7 +1324,7 @@ private ProjectionExpression VisitSelectMany(Expression source, LambdaExpression
             innerItemProjector = innerItemProjector.SetDefaultIfEmpty();
           }
 
-          innerProjection = projection.Apply(innerItemProjector);
+          innerProjection = projection.ApplyItemProjector(innerItemProjector);
         }
 
         var outerProjection = context.Bindings[outerParameter];
@@ -1348,7 +1344,7 @@ private ProjectionExpression VisitSelectMany(Expression source, LambdaExpression
 
         var resultProjection = CombineProjections(outerProjection, innerProjection, recordSet, resultSelector);
         var resultItemProjector = resultProjection.ItemProjector.RemoveOuterParameter();
-        resultProjection = resultProjection.Apply(resultItemProjector);
+        resultProjection = resultProjection.ApplyItemProjector(resultItemProjector);
         return resultProjection;
       }
     }
@@ -1513,7 +1509,7 @@ private Expression VisitExistsAsInclude(Expression source, LambdaExpression pred
           .Include(State.IncludeAlgorithm, true, rawProvider.Source, context.GetNextAlias(), filteredColumns);
 
         var newItemProjector = outerResult.ItemProjector.Remap(newDataSource, 0);
-        var newOuterResult = outerResult.Apply(newItemProjector);
+        var newOuterResult = outerResult.ApplyItemProjector(newItemProjector);
         context.Bindings.ReplaceBound(outerParameter, newOuterResult);
         Expression resultExpression = ColumnExpression.Create(WellKnownTypes.Bool, columnIndex);
         if (notExists) {
@@ -1698,7 +1694,7 @@ private ProjectionExpression VisitSequence(Expression sequenceExpression, Expres
       if (result != null) {
         var projectorExpression = result.ItemProjector.EnsureEntityIsJoined();
         if (projectorExpression != result.ItemProjector) {
-          result = result.Apply(projectorExpression);
+          result = result.ApplyItemProjector(projectorExpression);
         }
 
         return result;

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public override Expression ReplaceApplyParameter(ApplyParameter newApplyParamete`
`90`	`90`	`return new GroupingExpression(Type, OuterParameter, DefaultIfEmpty, ProjectionExpression, ApplyParameter, KeyExpression, SelectManyInfo);`
`91`	`91`
`92`	`92`	`var newItemProjector = ProjectionExpression.ItemProjector.RewriteApplyParameter(ApplyParameter, newApplyParameter);`
`93`		`- var newProjectionExpression = ProjectionExpression.Apply(newItemProjector);`
	`93`	`+ var newProjectionExpression = ProjectionExpression.ApplyItemProjector(newItemProjector);`
`94`	`94`	`return new GroupingExpression(Type, OuterParameter, DefaultIfEmpty, newProjectionExpression, newApplyParameter, KeyExpression, SelectManyInfo);`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public virtual Expression ReplaceApplyParameter(ApplyParameter newApplyParameter`
`109`	`109`	`return new SubQueryExpression(Type, OuterParameter, DefaultIfEmpty, ProjectionExpression, ApplyParameter);`
`110`	`110`
`111`	`111`	`var newItemProjector = ProjectionExpression.ItemProjector.RewriteApplyParameter(ApplyParameter, newApplyParameter);`
`112`		`- var newProjectionExpression = ProjectionExpression.Apply(newItemProjector);`
	`112`	`+ var newProjectionExpression = ProjectionExpression.ApplyItemProjector(newItemProjector);`
`113`	`113`	`return new SubQueryExpression(Type, OuterParameter, DefaultIfEmpty, newProjectionExpression, newApplyParameter);`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected override Expression VisitProjectionExpression(ProjectionExpression pro`
`38`	`38`	`var itemChanged = item != projectionExpression.ItemProjector.Item;`
`39`	`39`	`if (providerChanged \|\| itemChanged) {`
`40`	`40`	`var itemProjector = new ItemProjectorExpression(item, provider, projectionExpression.ItemProjector.Context);`
`41`		`- return projectionExpression.Apply(itemProjector);`
	`41`	`+ return projectionExpression.ApplyItemProjector(itemProjector);`
`42`	`42`	`}`
`43`	`43`	`return projectionExpression;`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public override void ReplaceBound(ParameterExpression key, ProjectionExpression`
`66`	`66`	`if (parameter!=key) {`
`67`	`67`	`var projection = this[parameter];`
`68`	`68`	`var newItemProjector = projection.ItemProjector.Remap(value.ItemProjector.DataSource, 0);`
`69`		`- var newProjection = projection.Apply(newItemProjector);`
	`69`	`+ var newProjection = projection.ApplyItemProjector(newItemProjector);`
`70`	`70`	`base.ReplaceBound(parameter, newProjection);`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -706,7 +706,7 @@ protected override Expression VisitNew(NewExpression newExpression)`
`706`	`706`
`707`	`707`	`internal static bool FilterBindings(MemberInfo mi, string name, Type type)`
`708`	`708`	`{`
`709`		`- var result = String.Equals(mi.Name, name, StringComparison.InvariantCultureIgnoreCase);`
	`709`	`+ var result = string.Equals(mi.Name, name, StringComparison.InvariantCultureIgnoreCase);`
`710`	`710`	`if (!result)`
`711`	`711`	`return false;`
`712`	`712`
`@@ -725,7 +725,8 @@ internal static bool FilterBindings(MemberInfo mi, string name, Type type)`
`725`	`725`
`726`	`726`	`#region Private helper methods`
`727`	`727`
`728`		`- private Dictionary<MemberInfo, Expression> GetBindingsForConstructor(ParameterInfo[] constructorParameters, IList<Expression> constructorArguments, Expression newExpression)`
	`728`	`+ private Dictionary<MemberInfo, Expression> GetBindingsForConstructor(`
	`729`	`+ ParameterInfo[] constructorParameters, IList<Expression> constructorArguments, Expression newExpression)`
`729`	`730`	`{`
`730`	`731`	`var bindings = new Dictionary<MemberInfo, Expression>();`
`731`	`732`	`var duplicateMembers = new HashSet<MemberInfo>();`