Compare Queryable operators by MethodInfo

Part of #16300, not exhaustive
dotnet · Aug 8, 2019 · dad6bec · dad6bec
1 parent e9c18b1
commit dad6bec
Show file tree

Hide file tree

Showing 5 changed files with 370 additions and 380 deletions.
diff --git a/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -316,10 +317,13 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                     return null;
                 }
 
-                if ((methodCallExpression.Method.Name == nameof(Queryable.Any)
-                    || methodCallExpression.Method.Name == nameof(Queryable.All)
-                    || methodCallExpression.Method.Name == nameof(Queryable.Contains))
-                    && subquery.Tables.Count == 0)
+                if (subquery.Tables.Count == 0
+                    && methodCallExpression.Method.IsGenericMethod
+                    && methodCallExpression.Method.GetGenericMethodDefinition() is MethodInfo genericMethod
+                    && (genericMethod == QueryableMethodProvider.AnyWithoutPredicateMethodInfo
+                        || genericMethod == QueryableMethodProvider.AnyWithPredicateMethodInfo
+                        || genericMethod == QueryableMethodProvider.AllMethodInfo
+                        || genericMethod == QueryableMethodProvider.ContainsMethodInfo))
                 {
                     return subquery.Projection[0].Expression;
                 }

diff --git a/src/EFCore/Query/Internal/EntityEqualityRewritingExpressionVisitor.cs b/src/EFCore/Query/Internal/EntityEqualityRewritingExpressionVisitor.cs
@@ -188,6 +188,7 @@ protected override Expression VisitConditional(ConditionalExpression conditional
         protected override Expression VisitMethodCall(MethodCallExpression methodCallExpression)
         {
             var method = methodCallExpression.Method;
+            var genericMethod = method.IsGenericMethod ? method.GetGenericMethodDefinition() : null;
             var arguments = methodCallExpression.Arguments;
             Expression newSource;
 
@@ -219,37 +220,48 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                        : newMethodCall;
             }
 
-            if (method.DeclaringType == typeof(Queryable) || method.DeclaringType == typeof(QueryableExtensions))
+            switch (method.Name)
             {
-                switch (method.Name)
-                {
-                    // These are methods that require special handling
-                    case nameof(Queryable.Contains) when arguments.Count == 2:
-                        return VisitContainsMethodCall(methodCallExpression);
-
-                    case nameof(Queryable.OrderBy) when arguments.Count == 2:
-                    case nameof(Queryable.OrderByDescending) when arguments.Count == 2:
-                    case nameof(Queryable.ThenBy) when arguments.Count == 2:
-                    case nameof(Queryable.ThenByDescending) when arguments.Count == 2:
-                        return VisitOrderingMethodCall(methodCallExpression);
-
-                    // The following are projecting methods, which flow the entity type from *within* the lambda outside.
-                    case nameof(Queryable.Select):
-                    case nameof(Queryable.SelectMany):
-                        return VisitSelectMethodCall(methodCallExpression);
-
-                    case nameof(Queryable.GroupJoin):
-                    case nameof(Queryable.Join):
-                    case nameof(QueryableExtensions.LeftJoin):
-                        return VisitJoinMethodCall(methodCallExpression);
-
-                    case nameof(Queryable.GroupBy): // TODO: Implement
-                        break;
-                }
+                // These are methods that require special handling
+                case nameof(Queryable.Contains)
+                when genericMethod == QueryableMethodProvider.ContainsMethodInfo:
+                    return VisitContainsMethodCall(methodCallExpression);
+
+                case nameof(Queryable.OrderBy)
+                when genericMethod == QueryableMethodProvider.OrderByMethodInfo:
+                case nameof(Queryable.OrderByDescending)
+                when genericMethod == QueryableMethodProvider.OrderByDescendingMethodInfo:
+                case nameof(Queryable.ThenBy)
+                when genericMethod == QueryableMethodProvider.ThenByMethodInfo:
+                case nameof(Queryable.ThenByDescending) when genericMethod == QueryableMethodProvider.ThenByDescendingMethodInfo:
+                    return VisitOrderingMethodCall(methodCallExpression);
+
+                // The following are projecting methods, which flow the entity type from *within* the lambda outside.
+                case nameof(Queryable.Select)
+                when genericMethod == QueryableMethodProvider.SelectMethodInfo:
+                case nameof(Queryable.SelectMany)
+                when genericMethod == QueryableMethodProvider.SelectManyWithoutCollectionSelectorMethodInfo ||
+                     genericMethod == QueryableMethodProvider.SelectManyWithCollectionSelectorMethodInfo:
+                    return VisitSelectMethodCall(methodCallExpression);
+
+                case nameof(Queryable.GroupJoin)
+                when genericMethod == QueryableMethodProvider.GroupJoinMethodInfo:
+                case nameof(Queryable.Join)
+                when genericMethod == QueryableMethodProvider.JoinMethodInfo:
+                case nameof(QueryableExtensions.LeftJoin)
+                when genericMethod == QueryableExtensions.LeftJoinMethodInfo:
+                    return VisitJoinMethodCall(methodCallExpression);
+
+                case nameof(Queryable.GroupBy)
+                when genericMethod == QueryableMethodProvider.GroupByWithKeySelectorMethodInfo ||
+                     genericMethod == QueryableMethodProvider.GroupByWithKeyElementSelectorMethodInfo ||
+                     genericMethod == QueryableMethodProvider.GroupByWithKeyResultSelectorMethodInfo ||
+                     genericMethod == QueryableMethodProvider.GroupByWithKeyElementResultSelectorMethodInfo:
+                    break;  // TODO: Implement
             }
 
             // We handled the Contains Queryable extension method above, but there's also IList.Contains
-            if (method.IsGenericMethod && method.GetGenericMethodDefinition().Equals(_enumerableContainsMethodInfo)
+            if (genericMethod == _enumerableContainsMethodInfo
                 || method.DeclaringType.GetInterfaces().Contains(typeof(IList)) && string.Equals(method.Name, nameof(IList.Contains)))
             {
                 return VisitContainsMethodCall(methodCallExpression);
@@ -293,8 +305,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                     if (methodCallExpression.Method.ReturnType.TryGetSequenceType() is Type returnElementType
                         && (returnElementType == sourceElementType || sourceElementType == null))
                     {
-                        return newSourceWrapper.Update(
-                            methodCallExpression.Update(null, newArguments));
+                        return newSourceWrapper.Update(methodCallExpression.Update(null, newArguments));
                     }
 
                     // If the source type is an IQueryable over the return type, this is a cardinality-reducing method (e.g. First).