Query: Adds translation support for single key single value select GROUP BY LINQ queries

Microsoft.Azure.Cosmos/src/Linq/TranslationContext.cs

@@ -79,14 +79,14 @@ public Expression LookupSubstitution(ParameterExpression parameter)
  return this.substitutions.Lookup(parameter);
  }
 
- public ParameterExpression GenFreshParameter(Type parameterType, string baseParameterName)
+ public ParameterExpression GenerateFreshParameter(Type parameterType, string baseParameterName, bool includeSuffix = true)
  {
- return Utilities.NewParameter(baseParameterName, parameterType, this.InScope);
+ return Utilities.NewParameter(baseParameterName, parameterType, this.InScope, includeSuffix);
  }
 
  public Func<string, ParameterExpression> GetGenFreshParameterFunc()
  {
- return (paramName) => this.GenFreshParameter(typeof(object), paramName);
+ return (paramName) => this.GenerateFreshParameter(typeof(object), paramName);
  }
 
  /// <summary>

Microsoft.Azure.Cosmos/src/Linq/Utilities.cs

@@ -45,13 +45,14 @@ public static LambdaExpression GetLambda(Expression expr)
  /// <param name="prefix">Prefix for the parameter name.</param>
  /// <param name="type">Parameter type.</param>
  /// <param name="inScope">Names to avoid.</param>
+ /// <param name="includeSuffix">Enable suffix to parameter name</param>
  /// <returns>The new parameter.</returns>
- public static ParameterExpression NewParameter(string prefix, Type type, HashSet<ParameterExpression> inScope)
+ public static ParameterExpression NewParameter(string prefix, Type type, HashSet<ParameterExpression> inScope, bool includeSuffix = true)
  {
  int suffix = 0;
  while (true)
  {
- string name = prefix + suffix.ToString(CultureInfo.InvariantCulture);
+ string name = prefix + (includeSuffix ? suffix.ToString(CultureInfo.InvariantCulture) : string.Empty);
  ParameterExpression param = Expression.Parameter(type, name);
  if (!inScope.Any(p => p.Name.Equals(name)))
  {

Microsoft.Azure.Cosmos/src/SqlObjects/Visitors/SqlObjectTextSerializer.cs

@@ -495,6 +495,7 @@ public override void Visit(SqlQuery sqlQuery)
 
  if (sqlQuery.GroupByClause != null)
  {
+ this.WriteDelimiter(string.Empty);
  sqlQuery.GroupByClause.Accept(this);
  this.writer.Write(" ");
  }

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/LinqGeneralBaselineTests.TestGroupByTranslation.xml

@@ -0,0 +1,62 @@
+<Results>
+ <Result>
+ <Input>
+ <Description><![CDATA[GroupBy Single Value With Min]]></Description>
+ <Expression><![CDATA[query.GroupBy(k => k.FamilyId, (key, values) => values.Min())]]></Expression>
+ </Input>
+ <Output>
+ <SqlQuery><![CDATA[
+SELECT VALUE MIN(root["FamilyId"]) 
+FROM root GROUP BY root["FamilyId"] ]]></SqlQuery>
+ <ErrorMessage><![CDATA[Cannot deserialize the current JSON array (e.g. [1,2,3]) into type 'Microsoft.Azure.Cosmos.Services.Management.Tests.Family' because the type requires a JSON object (e.g. {"name":"value"}) to deserialize correctly.To fix this error either change the JSON to a JSON object (e.g. {"name":"value"}) or change the deserialized type to an array or a type that implements a collection interface (e.g. ICollection, IList) like List<T> that can be deserialized from a JSON array. JsonArrayAttribute can also be added to the type to force it to deserialize from a JSON array.Path '[0]', line 1, position 2.]]></ErrorMessage>
+ </Output>
+ </Result>
+ <Result>
+ <Input>
+ <Description><![CDATA[GroupBy Single Value With Max]]></Description>
+ <Expression><![CDATA[query.GroupBy(k => k.FamilyId, (key, values) => values.Max())]]></Expression>
+ </Input>
+ <Output>
+ <SqlQuery><![CDATA[
+SELECT VALUE MAX(root["FamilyId"]) 
+FROM root GROUP BY root["FamilyId"] ]]></SqlQuery>
+ <ErrorMessage><![CDATA[Cannot deserialize the current JSON array (e.g. [1,2,3]) into type 'Microsoft.Azure.Cosmos.Services.Management.Tests.Family' because the type requires a JSON object (e.g. {"name":"value"}) to deserialize correctly.To fix this error either change the JSON to a JSON object (e.g. {"name":"value"}) or change the deserialized type to an array or a type that implements a collection interface (e.g. ICollection, IList) like List<T> that can be deserialized from a JSON array. JsonArrayAttribute can also be added to the type to force it to deserialize from a JSON array.Path '[0]', line 1, position 2.]]></ErrorMessage>
+ </Output>
+ </Result>
+ <Result>
+ <Input>
+ <Description><![CDATA[GroupBy Single Value With Min]]></Description>
+ <Expression><![CDATA[query.GroupBy(k => k.FamilyId, (key, values) => values.Min(value => value.Int))]]></Expression>
+ </Input>
+ <Output>
+ <SqlQuery><![CDATA[
+SELECT VALUE MIN(root["Int"]) 
+FROM root GROUP BY root["FamilyId"] ]]></SqlQuery>
+ <ErrorMessage><![CDATA[Unexpected character encountered while parsing value: [. Path '', line 1, position 2.]]></ErrorMessage>
+ </Output>
+ </Result>
+ <Result>
+ <Input>
+ <Description><![CDATA[GroupBy Single Value With Max]]></Description>
+ <Expression><![CDATA[query.GroupBy(k => k.FamilyId, (key, values) => values.Max(value => value.Int))]]></Expression>
+ </Input>
+ <Output>
+ <SqlQuery><![CDATA[
+SELECT VALUE MAX(root["Int"]) 
+FROM root GROUP BY root["FamilyId"] ]]></SqlQuery>
+ <ErrorMessage><![CDATA[Unexpected character encountered while parsing value: [. Path '', line 1, position 2.]]></ErrorMessage>
+ </Output>
+ </Result>
+ <Result>
+ <Input>
+ <Description><![CDATA[GroupBy Single Value With Count]]></Description>
+ <Expression><![CDATA[query.GroupBy(k => k.FamilyId, (key, values) => values.Count())]]></Expression>
+ </Input>
+ <Output>
+ <SqlQuery><![CDATA[
+SELECT VALUE COUNT(1) 
+FROM root GROUP BY root["FamilyId"] ]]></SqlQuery>
+ <ErrorMessage><![CDATA[Unexpected character encountered while parsing value: [. Path '', line 1, position 2.]]></ErrorMessage>
+ </Output>
+ </Result>
+</Results>

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Linq/LinqGeneralBaselineTests.cs

@@ -1273,6 +1273,27 @@ orderby f.FamilyId descending
  this.ExecuteTestSuite(inputs);
  }
 
+ [TestMethod]
+ public void TestGroupByTranslation()
+ {
+ List<LinqTestInput> inputs = new List<LinqTestInput>();
+ //inputs.Add(new LinqTestInput("GroupBy select single key", b => getQuery(b).GroupBy(k => k.FamilyId /*keySelector*/)));
+
+ inputs.Add(new LinqTestInput("GroupBy Single Value With Min", b => getQuery(b).GroupBy(k => k.FamilyId /*keySelector*/,
+ (key, values) => values.Min() /*return the Min of each group */)));
+ inputs.Add(new LinqTestInput("GroupBy Single Value With Max", b => getQuery(b).GroupBy(k => k.FamilyId /*keySelector*/,
+ (key, values) => values.Max() /*return the Max of each group */)));
+
+ inputs.Add(new LinqTestInput("GroupBy Single Value With Min", b => getQuery(b).GroupBy(k => k.FamilyId /*keySelector*/,
+ (key, values) => values.Min(value => value.Int) /*return the Min of each group */)));
+ inputs.Add(new LinqTestInput("GroupBy Single Value With Max", b => getQuery(b).GroupBy(k => k.FamilyId /*keySelector*/,
+ (key, values) => values.Max(value => value.Int) /*return the Max of each group */)));
+ inputs.Add(new LinqTestInput("GroupBy Single Value With Count", b => getQuery(b).GroupBy(k => k.FamilyId /*keySelector*/,
+ (key, values) => values.Count() /*return the Count of each group */)));
+
+ this.ExecuteTestSuite(inputs);
+ }
+
  [TestMethod]
  public void TestLambdaReuse()
  {

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/BaselineTest/TestBaseline/GroupByClauseSqlParserBaselineTests.Tests.xml

@@ -5,7 +5,7 @@
  <Query><![CDATA[SELECT * GROUP BY 1]]></Query>
  </Input>
  <Output>
- <ParsedQuery><![CDATA[SELECT *GROUP BY 1 ]]></ParsedQuery>
+ <ParsedQuery><![CDATA[SELECT * GROUP BY 1 ]]></ParsedQuery>
  </Output>
  </Result>
  <Result>
@@ -14,7 +14,7 @@
  <Query><![CDATA[SELECT * GrOuP By 1]]></Query>
  </Input>
  <Output>
- <ParsedQuery><![CDATA[SELECT *GROUP BY 1 ]]></ParsedQuery>
+ <ParsedQuery><![CDATA[SELECT * GROUP BY 1 ]]></ParsedQuery>
  </Output>
  </Result>
  <Result>
@@ -23,7 +23,7 @@
  <Query><![CDATA[SELECT * GROUP BY 1, 2, 3]]></Query>
  </Input>
  <Output>
- <ParsedQuery><![CDATA[SELECT *GROUP BY 1, 2, 3 ]]></ParsedQuery>
+ <ParsedQuery><![CDATA[SELECT * GROUP BY 1, 2, 3 ]]></ParsedQuery>
  </Output>
  </Result>
  <Result>

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/BaselineTest/TestBaseline/SqlObjectVisitorBaselineTests.SqlQueries.xml

@@ -989,16 +989,17 @@ OFFSET 0 LIMIT 0
 }]]></SqlObject>
  </Input>
  <Output>
- <TextOutput><![CDATA[SELECT * FROM inputPathCollection["somePath"] AS some alias WHERE ("this path" < 42)GROUP BY "some"["random"]["path"][42] ORDER BY "some"["random"]["path"][42] ASC OFFSET 0 LIMIT 0]]></TextOutput>
+ <TextOutput><![CDATA[SELECT * FROM inputPathCollection["somePath"] AS some alias WHERE ("this path" < 42) GROUP BY "some"["random"]["path"][42] ORDER BY "some"["random"]["path"][42] ASC OFFSET 0 LIMIT 0]]></TextOutput>
  <PrettyPrint><![CDATA[
 SELECT * 
 FROM inputPathCollection["somePath"] AS some alias 
-WHERE ("this path" < 42)GROUP BY "some"["random"]["path"][42] 
+WHERE ("this path" < 42) 
+GROUP BY "some"["random"]["path"][42] 
 ORDER BY "some"["random"]["path"][42] ASC 
 OFFSET 0 LIMIT 0
 ]]></PrettyPrint>
  <HashCode>-245344741</HashCode>
- <ObfusctedQuery><![CDATA[SELECT * FROM ident1__19["str1"] AS ident2__10 WHERE ("str2" < 42)GROUP BY "str3"["str4"]["str5"][42] ORDER BY "str3"["str4"]["str5"][42] ASC OFFSET 0 LIMIT 0]]></ObfusctedQuery>
+ <ObfusctedQuery><![CDATA[SELECT * FROM ident1__19["str1"] AS ident2__10 WHERE ("str2" < 42) GROUP BY "str3"["str4"]["str5"][42] ORDER BY "str3"["str4"]["str5"][42] ASC OFFSET 0 LIMIT 0]]></ObfusctedQuery>
  </Output>
  </Result>
  <Result>
@@ -1127,18 +1128,19 @@ OFFSET 0 LIMIT 0
 }]]></SqlObject>
  </Input>
  <Output>
- <TextOutput><![CDATA[(SELECT * FROM inputPathCollection["somePath"] AS some alias WHERE ("this path" < 42)GROUP BY "some"["random"]["path"][42] ORDER BY "some"["random"]["path"][42] ASC OFFSET 0 LIMIT 0)]]></TextOutput>
+ <TextOutput><![CDATA[(SELECT * FROM inputPathCollection["somePath"] AS some alias WHERE ("this path" < 42) GROUP BY "some"["random"]["path"][42] ORDER BY "some"["random"]["path"][42] ASC OFFSET 0 LIMIT 0)]]></TextOutput>
  <PrettyPrint><![CDATA[
 (
  SELECT * 
  FROM inputPathCollection["somePath"] AS some alias 
- WHERE ("this path" < 42)GROUP BY "some"["random"]["path"][42] 
+ WHERE ("this path" < 42) 
+ GROUP BY "some"["random"]["path"][42] 
  ORDER BY "some"["random"]["path"][42] ASC 
  OFFSET 0 LIMIT 0
 )
 ]]></PrettyPrint>
  <HashCode>51808704</HashCode>
- <ObfusctedQuery><![CDATA[(SELECT * FROM ident1__19["str1"] AS ident2__10 WHERE ("str2" < 42)GROUP BY "str3"["str4"]["str5"][42] ORDER BY "str3"["str4"]["str5"][42] ASC OFFSET 0 LIMIT 0)]]></ObfusctedQuery>
+ <ObfusctedQuery><![CDATA[(SELECT * FROM ident1__19["str1"] AS ident2__10 WHERE ("str2" < 42) GROUP BY "str3"["str4"]["str5"][42] ORDER BY "str3"["str4"]["str5"][42] ASC OFFSET 0 LIMIT 0)]]></ObfusctedQuery>
  </Output>
  </Result>
  <Result>
@@ -1267,18 +1269,19 @@ OFFSET 0 LIMIT 0
 }]]></SqlObject>
  </Input>
  <Output>
- <TextOutput><![CDATA[ARRAY(SELECT * FROM inputPathCollection["somePath"] AS some alias WHERE ("this path" < 42)GROUP BY "some"["random"]["path"][42] ORDER BY "some"["random"]["path"][42] ASC OFFSET 0 LIMIT 0)]]></TextOutput>
+ <TextOutput><![CDATA[ARRAY(SELECT * FROM inputPathCollection["somePath"] AS some alias WHERE ("this path" < 42) GROUP BY "some"["random"]["path"][42] ORDER BY "some"["random"]["path"][42] ASC OFFSET 0 LIMIT 0)]]></TextOutput>
  <PrettyPrint><![CDATA[
 ARRAY(
  SELECT * 
  FROM inputPathCollection["somePath"] AS some alias 
- WHERE ("this path" < 42)GROUP BY "some"["random"]["path"][42] 
+ WHERE ("this path" < 42) 
+ GROUP BY "some"["random"]["path"][42] 
  ORDER BY "some"["random"]["path"][42] ASC 
  OFFSET 0 LIMIT 0
 )
 ]]></PrettyPrint>
  <HashCode>-1922520573</HashCode>
- <ObfusctedQuery><![CDATA[ARRAY(SELECT * FROM ident1__19["str1"] AS ident2__10 WHERE ("str2" < 42)GROUP BY "str3"["str4"]["str5"][42] ORDER BY "str3"["str4"]["str5"][42] ASC OFFSET 0 LIMIT 0)]]></ObfusctedQuery>
+ <ObfusctedQuery><![CDATA[ARRAY(SELECT * FROM ident1__19["str1"] AS ident2__10 WHERE ("str2" < 42) GROUP BY "str3"["str4"]["str5"][42] ORDER BY "str3"["str4"]["str5"][42] ASC OFFSET 0 LIMIT 0)]]></ObfusctedQuery>
  </Output>
  </Result>
  <Result>
@@ -1407,18 +1410,19 @@ ARRAY(
 }]]></SqlObject>
  </Input>
  <Output>
- <TextOutput><![CDATA[EXISTS(SELECT * FROM inputPathCollection["somePath"] AS some alias WHERE ("this path" < 42)GROUP BY "some"["random"]["path"][42] ORDER BY "some"["random"]["path"][42] ASC OFFSET 0 LIMIT 0)]]></TextOutput>
+ <TextOutput><![CDATA[EXISTS(SELECT * FROM inputPathCollection["somePath"] AS some alias WHERE ("this path" < 42) GROUP BY "some"["random"]["path"][42] ORDER BY "some"["random"]["path"][42] ASC OFFSET 0 LIMIT 0)]]></TextOutput>
  <PrettyPrint><![CDATA[
 EXISTS(
  SELECT * 
  FROM inputPathCollection["somePath"] AS some alias 
- WHERE ("this path" < 42)GROUP BY "some"["random"]["path"][42] 
+ WHERE ("this path" < 42) 
+ GROUP BY "some"["random"]["path"][42] 
  ORDER BY "some"["random"]["path"][42] ASC 
  OFFSET 0 LIMIT 0
 )
 ]]></PrettyPrint>
  <HashCode>1317938775</HashCode>
- <ObfusctedQuery><![CDATA[EXISTS(SELECT * FROM ident1__19["str1"] AS ident2__10 WHERE ("str2" < 42)GROUP BY "str3"["str4"]["str5"][42] ORDER BY "str3"["str4"]["str5"][42] ASC OFFSET 0 LIMIT 0)]]></ObfusctedQuery>
+ <ObfusctedQuery><![CDATA[EXISTS(SELECT * FROM ident1__19["str1"] AS ident2__10 WHERE ("str2" < 42) GROUP BY "str3"["str4"]["str5"][42] ORDER BY "str3"["str4"]["str5"][42] ASC OFFSET 0 LIMIT 0)]]></ObfusctedQuery>
  </Output>
  </Result>
 </Results>