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.

Sign up for GitHub

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

Query: new 'VisitUnderlyingQuerySources' extension method #7794

Closed
wants to merge 1 commit into from
Closed

Query: new 'VisitUnderlyingQuerySources' extension method #7794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 3 additions & 56 deletions src/EFCore/Query/ExpressionVisitors/Internal/RequiresMaterializationExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using JetBrains.Annotations;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Query.Expressions.Internal;
using Microsoft.EntityFrameworkCore.Query.Internal;
using Remotion.Linq;
using Remotion.Linq.Clauses;
using Remotion.Linq.Clauses.Expressions;
Expand Down Expand Up @@ -253,7 +254,7 @@ var referencedQuerySource

private void DemoteQuerySource(IQuerySource querySource)
{
HandleUnderlyingQuerySources(querySource, DemoteQuerySource);
querySource.VisitUnderlyingQuerySources(DemoteQuerySource);

if (_querySourceReferences.ContainsKey(querySource))
{
Expand All @@ -263,7 +264,7 @@ private void DemoteQuerySource(IQuerySource querySource)

private void PromoteQuerySource(IQuerySource querySource)
{
HandleUnderlyingQuerySources(querySource, PromoteQuerySource);
querySource.VisitUnderlyingQuerySources(PromoteQuerySource);

if (!_querySourceReferences.ContainsKey(querySource))
{
Expand All @@ -275,60 +276,6 @@ private void PromoteQuerySource(IQuerySource querySource)
}
}

private void HandleUnderlyingQuerySources(IQuerySource querySource, Action<IQuerySource> action)
{
if (querySource is GroupResultOperator groupResultOperator)
{
var keySelectorExpression
= groupResultOperator.KeySelector is SubQueryExpression keySelectorSubQuery
? keySelectorSubQuery.QueryModel.SelectClause.Selector
: groupResultOperator.KeySelector;

if (keySelectorExpression is QuerySourceReferenceExpression keySelectorQsre)
{
action(keySelectorQsre.ReferencedQuerySource);
}

var elementSelectorExpression
= groupResultOperator.ElementSelector is SubQueryExpression elementSelectorSubQuery
? elementSelectorSubQuery.QueryModel.SelectClause.Selector
: groupResultOperator.ElementSelector;

if (elementSelectorExpression is QuerySourceReferenceExpression elementSelectorQsre)
{
action(elementSelectorQsre.ReferencedQuerySource);
}
}
else if (querySource is GroupJoinClause groupJoinClause)
{
action(groupJoinClause.JoinClause);
}
else
{
var underlyingExpression
= ((querySource as FromClauseBase)?.FromExpression)
?? ((querySource as JoinClause)?.InnerSequence);

if (underlyingExpression is SubQueryExpression subQueryExpression)
{
var finalResultOperator = subQueryExpression.QueryModel.ResultOperators.LastOrDefault();

if (finalResultOperator is IQuerySource querySourceResultOperator)
{
action(querySourceResultOperator);
}
else if (subQueryExpression.QueryModel.SelectClause.Selector is QuerySourceReferenceExpression qsre)
{
action(qsre.ReferencedQuerySource);
}
}
else if (underlyingExpression is QuerySourceReferenceExpression qsre)
{
action(qsre.ReferencedQuerySource);
}
}
}

private void AdjustForResultOperators(QueryModel queryModel)
{
var referencedQuerySource
Expand Down
53 changes: 53 additions & 0 deletions src/EFCore/Query/Internal/QuerySourceExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.Linq;
using System.Linq.Expressions;
using JetBrains.Annotations;
using Microsoft.EntityFrameworkCore.Utilities;
using Remotion.Linq.Clauses;
using Remotion.Linq.Clauses.Expressions;
using Remotion.Linq.Clauses.ResultOperators;

namespace Microsoft.EntityFrameworkCore.Query.Internal
{
Expand All @@ -25,5 +29,54 @@ public static bool HasGeneratedItemName([NotNull] this IQuerySource querySource)

return querySource.ItemName.StartsWith("<generated>_", StringComparison.Ordinal);
}

/// <summary>
/// This API supports the Entity Framework Core infrastructure and is not intended to be used
/// directly from your code. This API may change or be removed in future releases.
/// </summary>
public static void VisitUnderlyingQuerySources([NotNull] this IQuerySource querySource, Action<IQuerySource> action)
{
switch (querySource)
{
case GroupResultOperator groupResultOperator:
VisitUnderlyingQuerySources(groupResultOperator.KeySelector, action);
VisitUnderlyingQuerySources(groupResultOperator.ElementSelector, action);
break;
case GroupJoinClause groupJoinClause:
action(groupJoinClause.JoinClause);
break;
case JoinClause joinClause:
VisitUnderlyingQuerySources(joinClause.InnerSequence, action);
break;
case FromClauseBase fromClauseBase:
VisitUnderlyingQuerySources(fromClauseBase.FromExpression, action);
break;
}
}

private static void VisitUnderlyingQuerySources(Expression expression, Action<IQuerySource> action)
{
switch (expression)
{
case QuerySourceReferenceExpression querySourceReferenceExpression:
action(querySourceReferenceExpression.ReferencedQuerySource);
break;
case SubQueryExpression subQueryExpression:
VisitUnderlyingQuerySources(subQueryExpression, action);
break;
}
}

private static void VisitUnderlyingQuerySources(SubQueryExpression subQueryExpression, Action<IQuerySource> action)
{
if (subQueryExpression.QueryModel.ResultOperators.LastOrDefault() is IQuerySource querySourceResultOperator)
{
action(querySourceResultOperator);
}
else
{
VisitUnderlyingQuerySources(subQueryExpression.QueryModel.SelectClause.Selector, action);
}
}
}
}