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

CSHARP-5396: Add support for arbitrary join inner expression arguments in LINQ #1531

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

CSHARP-5396: Add support for arbitrary join inner expression arguments in LINQ #1531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f1793b
CSHARP-5396: Fix LINQ join error when add .Where to foreign collectio…
kerem-acer Nov 4, 2024
19d088b
Add support for arbitrary inner expression arguments
kerem-acer Nov 11, 2024
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
26 changes: 19 additions & 7 deletions src/MongoDB.Driver/Linq/Linq3Implementation/ExtensionMethods/ExpressionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,32 @@ public static object Evaluate(this Expression expression)
}
}

public static (string CollectionName, IBsonSerializer DocumentSerializer) GetCollectionInfo(this Expression innerExpression, Expression containerExpression)
public static (IMongoQueryProviderInternal QueryProvider, bool IsRawCollectionExpression) FindMongoQueryProvider(this Expression innerExpression, Expression containerExpression)
{
if (innerExpression is ConstantExpression constantExpression &&
constantExpression.Value is IQueryable queryable &&
queryable.Provider is IMongoQueryProviderInternal mongoQueryProvider &&
mongoQueryProvider.CollectionNamespace != null)
var mongoQueryProvider = ExtractQueryProviderFromExpression(innerExpression);
if (mongoQueryProvider.QueryProvider is not null)
{
return (mongoQueryProvider.CollectionNamespace.CollectionName, mongoQueryProvider.PipelineInputSerializer);
return mongoQueryProvider;
}

var message = $"inner expression must be a MongoDB IQueryable against a collection";
var message = "inner expression must be a MongoDB IQueryable against a collection";
throw new ExpressionNotSupportedException(innerExpression, containerExpression, because: message);
}

private static (IMongoQueryProviderInternal QueryProvider, bool IsRawCollectionExpression) ExtractQueryProviderFromExpression(Expression expression, int depth = 0)
{
return expression switch
{
MethodCallExpression methodCallExpression => ExtractQueryProviderFromExpression(methodCallExpression.Arguments.FirstOrDefault(), depth + 1),
ConstantExpression constantExpression => constantExpression.Value switch
{
IQueryable { Provider: IMongoQueryProviderInternal queryProvider } => (queryProvider, depth == 0),
_ => default
},
_ => default
};
}

public static TValue GetConstantValue<TValue>(this Expression expression, Expression containingExpression)
{
if (expression is ConstantExpression constantExpression)
Expand Down
34 changes: 26 additions & 8 deletions ...tation/Translators/ExpressionToPipelineTranslators/GroupJoinMethodToPipelineTranslator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* limitations under the License.
*/

using System;
using System.Linq.Expressions;
using MongoDB.Bson.Serialization;
using MongoDB.Driver.Linq.Linq3Implementation.Ast;
Expand Down Expand Up @@ -59,19 +60,36 @@ public static AstPipeline Translate(TranslationContext context, MethodCallExpres
var wrappedOuterSerializer = WrappedValueSerializer.Create("_outer", outerSerializer);

var innerExpression = arguments[1];
var (innerCollectionName, innerSerializer) = innerExpression.GetCollectionInfo(containerExpression: expression);
var (queryProvider, isRawCollectionExpression) = innerExpression.FindMongoQueryProvider(containerExpression: expression);

var outerKeySelectorLambda = ExpressionHelper.UnquoteLambda(arguments[2]);
var localField = outerKeySelectorLambda.TranslateToDottedFieldName(context, wrappedOuterSerializer);

var innerKeySelectorLambda = ExpressionHelper.UnquoteLambda(arguments[3]);
var foreignField = innerKeySelectorLambda.TranslateToDottedFieldName(context, innerSerializer);
var foreignField = innerKeySelectorLambda.TranslateToDottedFieldName(context, queryProvider.PipelineInputSerializer);

var lookupStage = AstStage.Lookup(
from: innerCollectionName,
localField,
foreignField,
@as: "_inner");
AstStage lookupStage;

if (isRawCollectionExpression)
{
lookupStage = AstStage.Lookup(
from: queryProvider.CollectionNamespace.CollectionName,
localField,
foreignField,
@as: "_inner");
}
else
{
var lookupPipeline = ExpressionToPipelineTranslator.Translate(context, innerExpression);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we create a new TranslationContext for innerExpression?


lookupStage = AstStage.Lookup(
from: queryProvider.CollectionNamespace.CollectionName,
localField,
foreignField,
Array.Empty<AstComputedField>(),
lookupPipeline,
@as: "_inner");
}

var resultSelectorLambda = ExpressionHelper.UnquoteLambda(arguments[4]);
var root = AstExpression.Var("ROOT", isCurrent: true);
Expand All @@ -80,7 +98,7 @@ public static AstPipeline Translate(TranslationContext context, MethodCallExpres
var outerSymbol = context.CreateSymbol(outerParameter, outerField, outerSerializer);
var innerParameter = resultSelectorLambda.Parameters[1];
var innerField = AstExpression.GetField(root, "_inner");
var ienumerableInnerSerializer = IEnumerableSerializer.Create(innerSerializer);
var ienumerableInnerSerializer = IEnumerableSerializer.Create(queryProvider.PipelineInputSerializer);
var innerSymbol = context.CreateSymbol(innerParameter, innerField, ienumerableInnerSerializer);
var resultSelectorContext = context.WithSymbols(outerSymbol, innerSymbol);
var resultSelectorTranslation = ExpressionToAggregationExpressionTranslator.Translate(resultSelectorContext, resultSelectorLambda.Body);
Expand Down
34 changes: 26 additions & 8 deletions ...lementation/Translators/ExpressionToPipelineTranslators/JoinMethodToPipelineTranslator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
* limitations under the License.
*/

using System.Linq;
using System;
using System.Linq.Expressions;
using MongoDB.Bson.Serialization;
using MongoDB.Driver.Linq.Linq3Implementation.Ast;
Expand Down Expand Up @@ -63,15 +65,31 @@ public static AstPipeline Translate(TranslationContext context, MethodCallExpres
AstProject.Exclude("_id"));
var wrappedOuterSerializer = WrappedValueSerializer.Create("_outer", outerSerializer);

var (innerCollectionName, innerSerializer) = innerExpression.GetCollectionInfo(containerExpression: expression);
var (queryProvider, isRawCollectionExpression) = innerExpression.FindMongoQueryProvider(containerExpression: expression);
var localField = outerKeySelectorLambda.TranslateToDottedFieldName(context, wrappedOuterSerializer);
var foreignField = innerKeySelectorLambda.TranslateToDottedFieldName(context, innerSerializer);
var foreignField = innerKeySelectorLambda.TranslateToDottedFieldName(context, queryProvider.PipelineInputSerializer);

var lookupStage = AstStage.Lookup(
from: innerCollectionName,
localField,
foreignField,
@as: "_inner");
AstStage lookupStage;

if (isRawCollectionExpression)
{
lookupStage = AstStage.Lookup(
from: queryProvider.CollectionNamespace.CollectionName,
localField,
foreignField,
@as: "_inner");
}
else
{
var lookupPipeline = ExpressionToPipelineTranslator.Translate(context, innerExpression);
lookupStage = AstStage.Lookup(
from: queryProvider.CollectionNamespace.CollectionName,
localField,
foreignField,
Array.Empty<AstComputedField>(),
lookupPipeline,
@as: "_inner");
}

var unwindStage = AstStage.Unwind("_inner");

Expand All @@ -80,7 +98,7 @@ public static AstPipeline Translate(TranslationContext context, MethodCallExpres
var outerSymbol = context.CreateSymbol(outerParameter, outerField, outerSerializer);
var innerParameter = resultSelectorLambda.Parameters[1];
var innerField = AstExpression.GetField(AstExpression.RootVar, "_inner");
var innerSymbol = context.CreateSymbol(innerParameter, innerField, innerSerializer);
var innerSymbol = context.CreateSymbol(innerParameter, innerField, queryProvider.PipelineInputSerializer);
var resultSelectorContext = context.WithSymbols(outerSymbol, innerSymbol);
var resultSelectorTranslation = ExpressionToAggregationExpressionTranslator.Translate(resultSelectorContext, resultSelectorLambda.Body);
var (projectStage, projectSerializer) = ProjectionHelper.CreateProjectStage(resultSelectorTranslation);
Expand Down