[Query] Remove QueryExpression from ProjectionBindingExpression (#15609)

Invariant: ProjectionBindingExpression can only appear in ShapedQueryExpression.ShaperExpression and it would always refer to ShapedQueryExpression.QueryExpression
dotnet · May 3, 2019 · 946664e · 946664e
1 parent 4035d93
commit 946664e
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 24 deletions.
diff --git a/src/EFCore.InMemory/Query/PipeLine/InMemoryProjectionBindingExpressionVisitor.cs b/src/EFCore.InMemory/Query/PipeLine/InMemoryProjectionBindingExpressionVisitor.cs
@@ -77,7 +77,7 @@ public override Expression Visit(Expression expression)
 
                 _projectionMapping[_projectionMembers.Peek()] = translation;
 
-                return new ProjectionBindingExpression(_queryExpression, _projectionMembers.Peek(), expression.Type);
+                return new ProjectionBindingExpression(_projectionMembers.Peek(), expression.Type);
             }
 
             return base.Visit(expression);
@@ -92,7 +92,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
                         entityShaperExpression.ValueBufferExpression.ProjectionMember);
 
                 return entityShaperExpression.Update(
-                    new ProjectionBindingExpression(_queryExpression, _projectionMembers.Peek(), typeof(ValueBuffer)));
+                    new ProjectionBindingExpression(_projectionMembers.Peek(), typeof(ValueBuffer)));
             }
 
             throw new InvalidOperationException();

diff --git a/src/EFCore.InMemory/Query/PipeLine/InMemoryQueryExpression.cs b/src/EFCore.InMemory/Query/PipeLine/InMemoryQueryExpression.cs
@@ -90,7 +90,7 @@ public Expression GetSingleScalarProjection()
             _projectionMapping.Clear();
             _projectionMapping[new ProjectionMember()] = _valueBufferSlots[0];
 
-            return new ProjectionBindingExpression(this, new ProjectionMember(), ServerQueryExpression.Type);
+            return new ProjectionBindingExpression(new ProjectionMember(), ServerQueryExpression.Type);
         }
 
         public Expression BindProperty(Expression projectionExpression, IProperty property)

diff --git a/src/EFCore.InMemory/Query/PipeLine/InMemoryShapedQueryExpression.cs b/src/EFCore.InMemory/Query/PipeLine/InMemoryShapedQueryExpression.cs
@@ -12,13 +12,9 @@ public class InMemoryShapedQueryExpression : ShapedQueryExpression
         public InMemoryShapedQueryExpression(IEntityType entityType)
         {
             QueryExpression = new InMemoryQueryExpression(entityType);
-            var resultParameter = Parameter(typeof(InMemoryQueryExpression), "result");
             ShaperExpression = new EntityShaperExpression(
                 entityType,
-                new ProjectionBindingExpression(
-                    QueryExpression,
-                    new ProjectionMember(),
-                    typeof(ValueBuffer)),
+                new ProjectionBindingExpression(new ProjectionMember(), typeof(ValueBuffer)),
                 false);
         }
     }

diff --git a/src/EFCore.Relational/Query/PipeLine/RelationalProjectionBindingExpressionVisitor.cs b/src/EFCore.Relational/Query/PipeLine/RelationalProjectionBindingExpressionVisitor.cs
@@ -87,7 +87,7 @@ public override Expression Visit(Expression expression)
 
                 _projectionMapping[_projectionMembers.Peek()] = translation ?? throw new InvalidOperationException();
 
-                return new ProjectionBindingExpression(_selectExpression, _projectionMembers.Peek(), expression.Type);
+                return new ProjectionBindingExpression(_projectionMembers.Peek(), expression.Type);
             }
 
             return base.Visit(expression);
@@ -102,7 +102,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
                         entityShaperExpression.ValueBufferExpression.ProjectionMember);
 
                 return entityShaperExpression.Update(
-                    new ProjectionBindingExpression(_selectExpression, _projectionMembers.Peek(), typeof(ValueBuffer)));
+                    new ProjectionBindingExpression(_projectionMembers.Peek(), typeof(ValueBuffer)));
             }
 
             throw new InvalidOperationException();

diff --git a/...EFCore.Relational/Query/PipeLine/RelationalQueryableMethodTranslatingExpressionVisitor.cs b/...EFCore.Relational/Query/PipeLine/RelationalQueryableMethodTranslatingExpressionVisitor.cs
@@ -65,7 +65,7 @@ protected override ShapedQueryExpression TranslateAll(ShapedQueryExpression sour
                     new List<ProjectionExpression>(),
                     new List<TableExpressionBase>());
 
-                source.ShaperExpression = new ProjectionBindingExpression(source.QueryExpression, new ProjectionMember(), typeof(bool));
+                source.ShaperExpression = new ProjectionBindingExpression(new ProjectionMember(), typeof(bool));
 
                 return source;
             }
@@ -99,7 +99,7 @@ protected override ShapedQueryExpression TranslateAny(ShapedQueryExpression sour
                 projectionMapping,
                 new List<ProjectionExpression>(),
                 new List<TableExpressionBase>());
-            source.ShaperExpression = new ProjectionBindingExpression(source.QueryExpression, new ProjectionMember(), typeof(bool));
+            source.ShaperExpression = new ProjectionBindingExpression(new ProjectionMember(), typeof(bool));
 
             return source;
         }
@@ -182,7 +182,7 @@ protected override ShapedQueryExpression TranslateContains(ShapedQueryExpression
                     projectionMapping,
                     new List<ProjectionExpression>(),
                     new List<TableExpressionBase>());
-                source.ShaperExpression = new ProjectionBindingExpression(source.QueryExpression, new ProjectionMember(), typeof(bool));
+                source.ShaperExpression = new ProjectionBindingExpression(new ProjectionMember(), typeof(bool));
 
                 return source;
             }
@@ -216,7 +216,7 @@ protected override ShapedQueryExpression TranslateCount(ShapedQueryExpression so
 
             selectExpression.ClearOrdering();
             selectExpression.ApplyProjection(_projectionMapping);
-            source.ShaperExpression = new ProjectionBindingExpression(selectExpression, new ProjectionMember(), typeof(int));
+            source.ShaperExpression = new ProjectionBindingExpression(new ProjectionMember(), typeof(int));
 
             return source;
         }
@@ -481,7 +481,7 @@ protected override ShapedQueryExpression TranslateLongCount(ShapedQueryExpressio
 
             selectExpression.ClearOrdering();
             selectExpression.ApplyProjection(_projectionMapping);
-            source.ShaperExpression = new ProjectionBindingExpression(selectExpression, new ProjectionMember(), typeof(long));
+            source.ShaperExpression = new ProjectionBindingExpression(new ProjectionMember(), typeof(long));
 
             return source;
         }
@@ -812,7 +812,7 @@ private ShapedQueryExpression AggregateResultShaper(
 
             selectExpression.ClearOrdering();
 
-            Expression shaper = new ProjectionBindingExpression(selectExpression, new ProjectionMember(), projection.Type);
+            Expression shaper = new ProjectionBindingExpression(new ProjectionMember(), projection.Type);
 
             if (throwOnNullResult)
             {

diff --git a/src/EFCore.Relational/Query/PipeLine/RelationalShapedQueryExpression.cs b/src/EFCore.Relational/Query/PipeLine/RelationalShapedQueryExpression.cs
@@ -13,11 +13,9 @@ public class RelationalShapedQueryExpression : ShapedQueryExpression
         public RelationalShapedQueryExpression(IEntityType entityType)
         {
             QueryExpression = new SelectExpression(entityType);
-            var resultParameter = Parameter(typeof(SelectExpression), "result");
             ShaperExpression = new EntityShaperExpression(
                 entityType,
                 new ProjectionBindingExpression(
-                    QueryExpression,
                     new ProjectionMember(),
                     typeof(ValueBuffer)),
                 false);

diff --git a/src/EFCore.Relational/Query/PipeLine/RelationalSqlTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/PipeLine/RelationalSqlTranslatingExpressionVisitor.cs
@@ -159,8 +159,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
 
             if (extensionExpression is ProjectionBindingExpression projectionBindingExpression)
             {
-                return ((SelectExpression)projectionBindingExpression.QueryExpression)
-                    .GetProjectionExpression(projectionBindingExpression.ProjectionMember);
+                return _selectExpression.GetProjectionExpression(projectionBindingExpression.ProjectionMember);
             }
 
             if (extensionExpression is NullConditionalExpression nullConditionalExpression)

diff --git a/src/EFCore/Query/PipeLine/ProjectionBindingExpression.cs b/src/EFCore/Query/PipeLine/ProjectionBindingExpression.cs
@@ -8,14 +8,12 @@ namespace Microsoft.EntityFrameworkCore.Query.Pipeline
 {
     public class ProjectionBindingExpression : Expression
     {
-        public ProjectionBindingExpression(Expression queryExpression, ProjectionMember projectionMember, Type type)
+        public ProjectionBindingExpression(ProjectionMember projectionMember, Type type)
         {
-            QueryExpression = queryExpression;
             ProjectionMember = projectionMember;
             Type = type;
         }
 
-        public Expression QueryExpression { get; }
         public ProjectionMember ProjectionMember { get; }
         public override Type Type { get; }
         public override ExpressionType NodeType => ExpressionType.Extension;

diff --git a/src/EFCore/Query/PipeLine/QueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore/Query/PipeLine/QueryableMethodTranslatingExpressionVisitor.cs
@@ -576,7 +576,6 @@ protected override Expression VisitExtension(Expression node)
                 if (node is ProjectionBindingExpression projectionBindingExpression)
                 {
                     return new ProjectionBindingExpression(
-                        _queryExpression,
                         projectionBindingExpression.ProjectionMember.ShiftMember(_memberShift),
                         projectionBindingExpression.Type);
                 }