Fix EFCore memory lean when query contains collection constant, PR 2172

Author: habbes

src/Microsoft.AspNet.OData.Shared/Query/Expressions/ExpressionBinderBase.cs

@@ -1359,7 +1359,12 @@ public virtual Expression BindCollectionConstantNode(CollectionConstantNode node
                 castedList.Add(member);
             }
 
-            return Expression.Constant(castedList);
+            if (QuerySettings.EnableConstantParameterization)
+            {
+                return LinqParameterContainer.Parameterize(listType, castedList);
+            }
+
+            return Expression.Constant(castedList, listType);
         }
 
         private Expression BindCastSingleValue(SingleValueFunctionCallNode node)

test/UnitTest/Microsoft.AspNet.OData.Test.Shared/Query/Expressions/FilterBinderTests.cs

@@ -1642,8 +1642,8 @@ public void EnumInExpression()
                 "$it => System.Collections.Generic.List`1[Microsoft.AspNet.OData.Test.Common.Types.SimpleEnum].Contains($it.SimpleEnumProp)");
             Expression<Func<DataTypes, bool>> expression = result.WithNullPropagation;
 
-            // expression tree is guaranteed by expression string above
-            var values = (IList<SimpleEnum>)((ConstantExpression)((MethodCallExpression) expression.Body).Arguments[0]).Value;
+            var memberAccess = (MemberExpression)((MethodCallExpression)expression.Body).Arguments[0];
+            var values = (IList<SimpleEnum>)ExpressionBinderBase.ExtractParameterizedConstant(memberAccess);
             Assert.Equal(new[] {SimpleEnum.First, SimpleEnum.Second}, values);
         }
 
@@ -1663,8 +1663,8 @@ public void EnumInExpression_NullableEnum_WithNullable()
                 "$it => System.Collections.Generic.List`1[System.Nullable`1[Microsoft.AspNet.OData.Test.Common.Types.SimpleEnum]].Contains($it.NullableSimpleEnumProp)");
             Expression<Func<DataTypes, bool>> expression = result.WithNullPropagation;
 
-            // expression tree is guaranteed by expression string above
-            var values = (IList<SimpleEnum?>)((ConstantExpression)((MethodCallExpression) expression.Body).Arguments[0]).Value;
+            var memberAccess = (MemberExpression)((MethodCallExpression)expression.Body).Arguments[0];
+            var values = (IList<SimpleEnum?>)ExpressionBinderBase.ExtractParameterizedConstant(memberAccess);
             Assert.Equal(new SimpleEnum?[] {SimpleEnum.First, SimpleEnum.Second}, values);
         }
 
@@ -1676,8 +1676,8 @@ public void EnumInExpression_NullableEnum_WithNullValue()
                 "$it => System.Collections.Generic.List`1[System.Nullable`1[Microsoft.AspNet.OData.Test.Common.Types.SimpleEnum]].Contains($it.NullableSimpleEnumProp)");
             Expression<Func<DataTypes, bool>> expression = result.WithNullPropagation;
 
-            // expression tree is guaranteed by expression string above
-            var values = (IList<SimpleEnum?>)((ConstantExpression)((MethodCallExpression) expression.Body).Arguments[0]).Value;
+            var memberAccess = (MemberExpression)((MethodCallExpression)expression.Body).Arguments[0];
+            var values = (IList<SimpleEnum?>)ExpressionBinderBase.ExtractParameterizedConstant(memberAccess);
             Assert.Equal(new SimpleEnum?[] {SimpleEnum.First, null}, values);
         }
 
@@ -2875,6 +2875,50 @@ public void Constants_Are_Not_Parameterized_IfDisabled()
             Assert.Equal("$it => ($it.ProductName == \"1\")", (filters.WithoutNullPropagation as Expression).ToString());
         }
 
+        [Fact]
+        public void CollectionConstants_Are_Parameterized()
+        {
+            var result = VerifyQueryDeserialization("ProductName in ('Prod1', 'Prod2')",
+                "$it => System.Collections.Generic.List`1[System.String].Contains($it.ProductName)");
+
+            Expression<Func<Product, bool>> expression = result.WithNullPropagation;
+
+            var memberAccess = (MemberExpression)((MethodCallExpression)expression.Body).Arguments[0];
+            var values = (IList<string>)ExpressionBinderBase.ExtractParameterizedConstant(memberAccess);
+            Assert.Equal(new[] { "Prod1", "Prod2" }, values);
+        }
+
+        [Fact]
+        public void CollectionConstants_Are_Not_Parameterized_If_Disabled()
+        {
+            var result = VerifyQueryDeserialization("ProductName in ('Prod1', 'Prod2')",
+                "$it => System.Collections.Generic.List`1[System.String].Contains($it.ProductName)",
+                settingsCustomizer: (settings) =>
+                {
+                    settings.EnableConstantParameterization = false;
+                });
+
+            Expression<Func<Product, bool>> expression = result.WithNullPropagation;
+            var values = (IList<string>)((ConstantExpression)((MethodCallExpression)expression.Body).Arguments[0]).Value;
+            Assert.Equal(new[] { "Prod1", "Prod2" }, values);
+        }
+
+        [Fact]
+        public void CollectionConstants_OfEnums_Are_Not_Parameterized_If_Disabled()
+        {
+            var result = VerifyQueryDeserialization<DataTypes>(
+                "SimpleEnumProp in ('First', 'Second')",
+                "$it => System.Collections.Generic.List`1[Microsoft.AspNet.OData.Test.Common.Types.SimpleEnum].Contains($it.SimpleEnumProp)",
+                settingsCustomizer: (settings) =>
+                {
+                    settings.EnableConstantParameterization = false;
+                });
+
+            Expression<Func<DataTypes, bool>> expression = result.WithNullPropagation;
+            var values = (IList<SimpleEnum>)((ConstantExpression)((MethodCallExpression)expression.Body).Arguments[0]).Value;
+            Assert.Equal(new[] { SimpleEnum.First, SimpleEnum.Second }, values);
+        }
+
         [Fact]
         public void FilterByDynamicProperty()
         {