Skip to content

Query: Adds support for multi-value Group By query for LINQ #4481

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

Merged
merged 19 commits into from
Jul 9, 2024
Merged

Query: Adds support for multi-value Group By query for LINQ #4481

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
51d41ad
init
Apr 10, 2024
d8e7125
Added tests
Apr 11, 2024
f193d33
Preliminary code
May 12, 2024
342daba
merge with master
May 12, 2024
138936f
baseline
May 12, 2024
1954b51
add ordering ignore to test cases
May 13, 2024
29a15de
upate baseline
May 14, 2024
f6ab78c
address code review 1
May 21, 2024
49afa87
Changed the way comparison between Anonymoustype object worked. Also …
Jun 25, 2024
10c1fd8
Merge branch 'master' into users/leminh/LINQGroupByMultiValue
leminh98 Jun 25, 2024
c324414
addressed code review
Jul 1, 2024
d25ec72
Merge branch 'users/leminh/LINQGroupByMultiValue' of https://github.c…
Jul 1, 2024
019b8f2
Merge branch 'master' into users/leminh/LINQGroupByMultiValue
leminh98 Jul 1, 2024
d19b519
address code review
Jul 2, 2024
c5dd3be
Merge branch 'users/leminh/LINQGroupByMultiValue' of https://github.c…
Jul 2, 2024
de2eaf6
addressed missing field
Jul 2, 2024
e1f456f
Merge branch 'master' into users/leminh/LINQGroupByMultiValue
leminh98 Jul 2, 2024
428adc2
Merge branch 'master' into users/leminh/LINQGroupByMultiValue
leminh98 Jul 8, 2024
763e1b7
Merge branch 'master' into users/leminh/LINQGroupByMultiValue
leminh98 Jul 8, 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
216 changes: 179 additions & 37 deletions Microsoft.Azure.Cosmos/src/Linq/ExpressionToSQL.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,29 @@ private static SqlObjectProperty[] CreateInitializers(ReadOnlyCollection<Express
result[i] = prop;
}

return result;
}

private static SqlSelectItem[] CreateSelectItems(ReadOnlyCollection<Expression> arguments, ReadOnlyCollection<MemberInfo> members, TranslationContext context)
{
if (arguments.Count != members.Count)
{
throw new InvalidOperationException("Expected same number of arguments as members");
}

SqlSelectItem[] result = new SqlSelectItem[arguments.Count];
for (int i = 0; i < arguments.Count; i++)
{
Expression arg = arguments[i];
MemberInfo member = members[i];
SqlScalarExpression selectExpression = ExpressionToSql.VisitScalarExpression(arg, context);

string memberName = member.GetMemberName(context);
SqlIdentifier alias = SqlIdentifier.Create(memberName);
SqlSelectItem prop = SqlSelectItem.Create(selectExpression, alias);
result[i] = prop;
}

return result;
}

Expand Down Expand Up @@ -1314,6 +1337,80 @@ private static Collection VisitMethodCall(MethodCallExpression inputExpression,
context.PopMethod();
return result;
}

/// <summary>
/// Visit a method call, construct the corresponding query and return the select clause for the aggregate function.
/// At ExpressionToSql point only LINQ method calls are allowed.
/// These methods are static extension methods of IQueryable or IEnumerable.
/// </summary>
/// <param name="inputExpression">Method to translate.</param>
/// <param name="context">Query translation context.</param>
private static SqlSelectClause VisitGroupByAggregateMethodCall(MethodCallExpression inputExpression, TranslationContext context)
{
context.PushMethod(inputExpression);

Type declaringType = inputExpression.Method.DeclaringType;
if ((declaringType != typeof(Queryable) && declaringType != typeof(Enumerable))
|| !inputExpression.Method.IsStatic)
{
throw new DocumentQueryException(string.Format(CultureInfo.CurrentCulture, ClientResources.OnlyLINQMethodsAreSupported, inputExpression.Method.Name));
}

if (inputExpression.Object != null)
{
throw new DocumentQueryException(ClientResources.ExpectedMethodCallsMethods);
}

Expression inputCollection = inputExpression.Arguments[0]; // all these methods are static extension methods, so argument[0] is the collection

Collection collection = ExpressionToSql.Translate(inputCollection, context);
context.PushCollection(collection);

bool shouldBeOnNewQuery = context.CurrentQuery.ShouldBeOnNewQuery(inputExpression.Method.Name, inputExpression.Arguments.Count);
context.PushSubqueryBinding(shouldBeOnNewQuery);

if (context.LastExpressionIsGroupBy)
{
throw new DocumentQueryException(string.Format(CultureInfo.CurrentCulture, "Group By cannot be followed by other methods"));
}

SqlSelectClause select;
switch (inputExpression.Method.Name)
{
case LinqMethods.Average:
{
select = ExpressionToSql.VisitAggregateFunction(inputExpression.Arguments, context, SqlFunctionCallScalarExpression.Names.Avg);
break;
}
case LinqMethods.Count:
{
select = ExpressionToSql.VisitCount(inputExpression.Arguments, context);
break;
}
case LinqMethods.Max:
{
select = ExpressionToSql.VisitAggregateFunction(inputExpression.Arguments, context, SqlFunctionCallScalarExpression.Names.Max);
break;
}
case LinqMethods.Min:
{
select = ExpressionToSql.VisitAggregateFunction(inputExpression.Arguments, context, SqlFunctionCallScalarExpression.Names.Min);
break;
}
case LinqMethods.Sum:
{
select = ExpressionToSql.VisitAggregateFunction(inputExpression.Arguments, context, SqlFunctionCallScalarExpression.Names.Sum);
break;
}
default:
throw new DocumentQueryException(string.Format(CultureInfo.CurrentCulture, ClientResources.MethodNotSupported, inputExpression.Method.Name));
}

context.PopSubqueryBinding();
context.PopCollection();
context.PopMethod();
return select;
}

/// <summary>
/// Determine if an expression should be translated to a subquery.
Expand Down Expand Up @@ -1735,48 +1832,93 @@ private static Collection VisitGroupBy(Type returnElementType, ReadOnlyCollectio
switch (valueSelectorExpression.NodeType)
{
case ExpressionType.Constant:
{
ConstantExpression constantExpression = (ConstantExpression)valueSelectorExpression;
SqlScalarExpression selectExpression = ExpressionToSql.VisitConstant(constantExpression, context);

SqlSelectSpec sqlSpec = SqlSelectValueSpec.Create(selectExpression);
SqlSelectClause select = SqlSelectClause.Create(sqlSpec, null);
context.CurrentQuery = context.CurrentQuery.AddSelectClause(select, context);
break;
}
{
ConstantExpression constantExpression = (ConstantExpression)valueSelectorExpression;
SqlScalarExpression selectExpression = ExpressionToSql.VisitConstant(constantExpression, context);
SqlSelectSpec sqlSpec = SqlSelectValueSpec.Create(selectExpression);
SqlSelectClause select = SqlSelectClause.Create(sqlSpec, null);
context.CurrentQuery = context.CurrentQuery.AddSelectClause(select, context);
break;
}
case ExpressionType.Parameter:
{
ParameterExpression parameterValueExpression = (ParameterExpression)valueSelectorExpression;
SqlScalarExpression selectExpression = ExpressionToSql.VisitParameter(parameterValueExpression, context);
{
ParameterExpression parameterValueExpression = (ParameterExpression)valueSelectorExpression;
SqlScalarExpression selectExpression = ExpressionToSql.VisitParameter(parameterValueExpression, context);

SqlSelectSpec sqlSpec = SqlSelectValueSpec.Create(selectExpression);
SqlSelectClause select = SqlSelectClause.Create(sqlSpec, null);
context.CurrentQuery = context.CurrentQuery.AddSelectClause(select, context);
break;
}
SqlSelectSpec sqlSpec = SqlSelectValueSpec.Create(selectExpression);
SqlSelectClause select = SqlSelectClause.Create(sqlSpec, null);
context.CurrentQuery = context.CurrentQuery.AddSelectClause(select, context);
break;
}
case ExpressionType.Call:
{
// Single Value Selector
MethodCallExpression methodCallExpression = (MethodCallExpression)valueSelectorExpression;
switch (methodCallExpression.Method.Name)
{
case LinqMethods.Max:
case LinqMethods.Min:
case LinqMethods.Average:
case LinqMethods.Count:
case LinqMethods.Sum:
ExpressionToSql.VisitMethodCall(methodCallExpression, context);
break;
default:
throw new DocumentQueryException(string.Format(CultureInfo.CurrentCulture, ClientResources.MethodNotSupported, methodCallExpression.Method.Name));
}
// Single Value Selector
MethodCallExpression methodCallExpression = (MethodCallExpression)valueSelectorExpression;
SqlSelectClause select = ExpressionToSql.VisitGroupByAggregateMethodCall(methodCallExpression, context);
context.CurrentQuery = context.CurrentQuery.AddSelectClause(select, context);
break;
}
case ExpressionType.New:
{
// Add select item clause at the end of this method
NewExpression newExpression = (NewExpression)valueSelectorExpression;

break;
}
case ExpressionType.New:
// TODO: Multi Value Selector
throw new DocumentQueryException(string.Format(CultureInfo.CurrentCulture, ClientResources.ExpressionTypeIsNotSupported, ExpressionType.New));

if (newExpression.Members == null)
{
throw new DocumentQueryException(ClientResources.ConstructorInvocationNotSupported);
}

// Get the list of items and the bindings
ReadOnlyCollection<Expression> newExpressionArguments = newExpression.Arguments;
ReadOnlyCollection<MemberInfo> newExpressionMembers = newExpression.Members;

SqlSelectItem[] selectItems = new SqlSelectItem[newExpressionArguments.Count];
for (int i = 0; i < newExpressionArguments.Count; i++)
{
MemberInfo member = newExpressionMembers[i];
string memberName = member.GetMemberName(context);
SqlIdentifier alias = SqlIdentifier.Create(memberName);

Expression arg = newExpressionArguments[i];
switch (arg.NodeType)
{
case ExpressionType.Constant:
{
SqlScalarExpression selectExpression = ExpressionToSql.VisitConstant((ConstantExpression)arg, context);

SqlSelectItem prop = SqlSelectItem.Create(selectExpression, alias);
selectItems[i] = prop;
break;
}
case ExpressionType.Parameter:
{
SqlScalarExpression selectExpression = ExpressionToSql.VisitParameter((ParameterExpression)arg, context);

SqlSelectItem prop = SqlSelectItem.Create(selectExpression, alias);
selectItems[i] = prop;
break;
}
case ExpressionType.Call:
{
SqlSelectClause selectClause = ExpressionToSql.VisitGroupByAggregateMethodCall((MethodCallExpression)arg, context);
SqlScalarExpression selectExpression = ((SqlSelectValueSpec)selectClause.SelectSpec).Expression;

SqlSelectItem prop = SqlSelectItem.Create(selectExpression, alias);
selectItems[i] = prop;
break;
}
default:
throw new DocumentQueryException(string.Format(CultureInfo.CurrentCulture, ClientResources.ExpressionTypeIsNotSupported, arg.NodeType));
}
}

SqlSelectListSpec sqlSpec = SqlSelectListSpec.Create(selectItems);
SqlSelectClause select = SqlSelectClause.Create(sqlSpec, null);
context.CurrentQuery = context.CurrentQuery.AddSelectClause(select, context);

break;
}
default:
throw new DocumentQueryException(string.Format(CultureInfo.CurrentCulture, ClientResources.ExpressionTypeIsNotSupported, valueSelectorExpression.NodeType));
}
Expand Down
Loading