Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compare Queryable operators by MethodInfo #17012

Merged
merged 1 commit into from
Aug 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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).
Expand Down
Loading