Fix #4605 - Do not cache commands with Contains on Enumerable parameter.

dotnet · Mar 9, 2016 · 8ea9646 · 8ea9646
1 parent dde1912
commit 8ea9646
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 3 deletions.
diff --git a/...ntityFrameworkCore.Relational/Query/ExpressionVisitors/SqlTranslatingExpressionVisitor.cs b/...ntityFrameworkCore.Relational/Query/ExpressionVisitors/SqlTranslatingExpressionVisitor.cs
@@ -63,6 +63,8 @@ public SqlTranslatingExpressionVisitor(
 
         public virtual Expression ClientEvalPredicate { get; private set; }
 
+        public virtual bool HasContainsParameter { get; private set; }
+
         public override Expression Visit(Expression expression)
         {
             var translatedExpression = _compositeExpressionFragmentTranslator.Translate(expression);
@@ -541,6 +543,11 @@ protected override Expression VisitSubQuery(SubQueryExpression expression)
                         || fromExpression.NodeType == ExpressionType.ListInit
                         || fromExpression.NodeType == ExpressionType.NewArrayInit)
                     {
+                        if (fromExpression.NodeType == ExpressionType.Parameter)
+                        {
+                            HasContainsParameter = true;
+                        }
+
                         var memberItem = contains.Item as MemberExpression;
 
                         if (memberItem != null)

diff --git a/src/Microsoft.EntityFrameworkCore.Relational/Query/Expressions/SelectExpression.cs b/src/Microsoft.EntityFrameworkCore.Relational/Query/Expressions/SelectExpression.cs
@@ -32,6 +32,7 @@ public class SelectExpression : TableExpressionBase
         private int _subqueryDepth = -1;
 
         private bool _isDistinct;
+        private bool _hasContainsParameter;
 
         public virtual Expression Predicate { get; [param: CanBeNull] set; }
 
@@ -72,6 +73,7 @@ var selectExpression
                     _limit = _limit,
                     _offset = _offset,
                     _isDistinct = _isDistinct,
+                    _hasContainsParameter = _hasContainsParameter,
                     _subqueryDepth = _subqueryDepth,
                     IsProjectStar = IsProjectStar,
                     Predicate = Predicate
@@ -186,6 +188,16 @@ public virtual bool IsDistinct
             }
         }
 
+        public virtual bool HasContainsParameter
+        {
+            get
+            {
+                return _hasContainsParameter
+                    || _tables.OfType<SelectExpression>().Any(t => t.HasContainsParameter);
+            }
+            set { _hasContainsParameter = value; }
+        }
+
         public virtual Expression Limit
         {
             get { return _limit; }
@@ -288,12 +300,14 @@ public virtual SelectExpression PushDownSubquery()
             subquery._limit = _limit;
             subquery._offset = _offset;
             subquery._isDistinct = _isDistinct;
+            subquery._hasContainsParameter = _hasContainsParameter;
             subquery._subqueryDepth = _subqueryDepth;
             subquery.IsProjectStar = IsProjectStar || !subquery._projection.Any();
 
             _limit = null;
             _offset = null;
             _isDistinct = false;
+            _hasContainsParameter = false;
 
             Predicate = null;
 

diff --git a/src/Microsoft.EntityFrameworkCore.Relational/Query/Internal/ShaperCommandContext.cs b/src/Microsoft.EntityFrameworkCore.Relational/Query/Internal/ShaperCommandContext.cs
@@ -82,9 +82,13 @@ public ShaperCommandContext(
         public virtual IRelationalCommand GetRelationalCommand(
             [NotNull] IReadOnlyDictionary<string, object> parameters)
         {
-            return _commandCache.GetOrAdd(
-                new CommandCacheKey(parameters),
-                cck => QuerySqlGeneratorFactory().GenerateSql(parameters));
+            var generator = QuerySqlGeneratorFactory();
+
+            return generator.CanCacheCommand
+                ? _commandCache.GetOrAdd(
+                    new CommandCacheKey(parameters),
+                    cck => generator.GenerateSql(parameters))
+                : generator.GenerateSql(parameters); ;
         }
 
         public virtual void NotifyReaderCreated([NotNull] DbDataReader dataReader)

diff --git a/src/Microsoft.EntityFrameworkCore.Relational/Query/RelationalQueryModelVisitor.cs b/src/Microsoft.EntityFrameworkCore.Relational/Query/RelationalQueryModelVisitor.cs
@@ -718,6 +718,11 @@ var sqlTranslatingExpressionVisitor
                         = selectExpression.Predicate == null
                             ? sqlPredicateExpression
                             : Expression.AndAlso(selectExpression.Predicate, sqlPredicateExpression);
+
+                    if(sqlTranslatingExpressionVisitor.HasContainsParameter)
+                    {
+                        selectExpression.HasContainsParameter = true;
+                    }
                 }
                 else
                 {

diff --git a/src/Microsoft.EntityFrameworkCore.Relational/Query/Sql/DefaultQuerySqlGenerator.cs b/src/Microsoft.EntityFrameworkCore.Relational/Query/Sql/DefaultQuerySqlGenerator.cs
@@ -66,6 +66,8 @@ public DefaultQuerySqlGenerator(
             SelectExpression = selectExpression;
         }
 
+        public virtual bool CanCacheCommand => !SelectExpression.HasContainsParameter;
+
         protected virtual SelectExpression SelectExpression { get; }
 
         protected virtual ISqlGenerationHelper SqlGenerator => _sqlGenerationHelper;

diff --git a/src/Microsoft.EntityFrameworkCore.Relational/Query/Sql/IQuerySqlGenerator.cs b/src/Microsoft.EntityFrameworkCore.Relational/Query/Sql/IQuerySqlGenerator.cs
@@ -12,6 +12,8 @@ public interface IQuerySqlGenerator
     {
         IRelationalCommand GenerateSql([NotNull] IReadOnlyDictionary<string, object> parameterValues);
 
+        bool CanCacheCommand { get; }
+
         IRelationalValueBufferFactory CreateValueBufferFactory(
             [NotNull] IRelationalValueBufferFactoryFactory relationalValueBufferFactoryFactory,
             [NotNull] DbDataReader dataReader);