Skip to content

Query: Fixes LINQ to use custom serializer to serialize constant values in Query #3406

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
ealsur merged 17 commits into from
Oct 13, 2022
Merged

Query: Fixes LINQ to use custom serializer to serialize constant values in Query #3406

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e360dca
Add custom serializer to SqlObjectCreate argument to use when seriali…
Aug 16, 2022
e186f37
Provide serializer fix
Aug 22, 2022
b1eae2a
Clean up code change
Aug 24, 2022
13da7af
more clean up, removing the ToString from SqlObjectCreate fix
Aug 24, 2022
e6e2a1d
undo some old changes that no longer apply
Aug 24, 2022
46f4ff9
revert accidental change
Aug 25, 2022
d47b8ba
Address code reivew
Oct 10, 2022
022666b
Merge branch 'master' into users/leminh/GetItemLinqQuerableSerializerFix
leminh98 Oct 10, 2022
4bc1673
fix some unused var
Oct 10, 2022
6957e0f
Merge branch 'users/leminh/GetItemLinqQuerableSerializerFix' of https…
Oct 10, 2022
e320d7d
remove gateway policy
Oct 10, 2022
663ea3f
Change name for the Options property
Oct 11, 2022
8e3329c
contract change
Oct 11, 2022
cf12416
Merge branch 'master' into users/leminh/GetItemLinqQuerableSerializerFix
leminh98 Oct 12, 2022
4359ec7
change field to be internal
Oct 12, 2022
233bbde
Merge branch 'master' into users/leminh/GetItemLinqQuerableSerializerFix
leminh98 Oct 13, 2022
e551fce
Merge branch 'master' into users/leminh/GetItemLinqQuerableSerializerFix
ealsur Oct 13, 2022
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
Prev Previous commit
Next Next commit
more clean up, removing the ToString from SqlObjectCreate fix
  • Loading branch information
Minh Le committed Aug 24, 2022
commit 13da7af125a5684933932b12d75b045471b718db
7 changes: 0 additions & 7 deletions Microsoft.Azure.Cosmos/src/SqlObjects/SqlObjectCreateScalarExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ private SqlObjectCreateScalarExpression(ImmutableArray<SqlObjectProperty> proper

public ImmutableArray<SqlObjectProperty> Properties { get; }

public CosmosSerializer UserSerializer { get; }

public static SqlObjectCreateScalarExpression Create(params SqlObjectProperty[] properties) => new SqlObjectCreateScalarExpression(properties.ToImmutableArray());

public static SqlObjectCreateScalarExpression Create(ImmutableArray<SqlObjectProperty> properties) => new SqlObjectCreateScalarExpression(properties);
Expand All @@ -56,10 +54,5 @@ private SqlObjectCreateScalarExpression(ImmutableArray<SqlObjectProperty> proper
public override TResult Accept<TResult>(SqlScalarExpressionVisitor<TResult> visitor) => visitor.Visit(this);

public override TResult Accept<T, TResult>(SqlScalarExpressionVisitor<T, TResult> visitor, T input) => visitor.Visit(this, input);

public override string ToString()
{
return base.ToString();
}
}
}
25 changes: 25 additions & 0 deletions ...neTest/TestBaseline/LinqTranslationWithCustomSerializerBaseline.TestMemberInitializer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<Results>
<Result>
<Input>
<Description><![CDATA[Filter w/ DataObject initializer with constant value]]></Description>
<Expression><![CDATA[query.Where(doc => (doc == new DataObject() {NumericField = 12, StringField = "12"}))]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE root
FROM root
WHERE (root = {"number": 12, "String_value": "12", "id": null, "Pk": null})]]></SqlQuery>
</Output>
</Result>
<Result>
<Input>
<Description><![CDATA[Select w/ DataObject initializer]]></Description>
<Expression><![CDATA[query.Select(doc => new DataObject() {NumericField = 12, StringField = "12"})]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE {"number": 12, "String_value": "12", "id": null, "Pk": null}
FROM root]]></SqlQuery>
</Output>
</Result>
</Results>
7 changes: 5 additions & 2 deletions ...tests/Microsoft.Azure.Cosmos.EmulatorTests/LinqTranslationWithCustomSerializerBaseline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,12 @@ DataObject createDataObj(Random random)

List<LinqTestInput> inputs = new List<LinqTestInput>
{
new LinqTestInput("Select w/ DataObject initializer", b => getQuery(b).Select(doc => new DataObject() { NumericField = doc.NumericField, StringField = doc.StringField })),
new LinqTestInput("Filter w/ DataObject initializer with constant value", b => getQuery(b).Where(doc => doc == new DataObject() { NumericField = 12, StringField = "12" })),
new LinqTestInput("Filter w/ DataObject initializer with member initialization", b => getQuery(b).Where(doc => doc == new DataObject() { NumericField = doc.NumericField, StringField = doc.StringField }))
new LinqTestInput("Select w/ DataObject initializer", b => getQuery(b).Select(doc => new DataObject() { NumericField = 12, StringField = "12" }))

// Negative test case: serializing only field name using custom serializer not currently supported
//new LinqTestInput("Select w/ DataObject initializer", b => getQuery(b).Select(doc => new DataObject() { NumericField = doc.NumericField, StringField = doc.StringField })),
//new LinqTestInput("Filter w/ DataObject initializer with member initialization", b => getQuery(b).Where(doc => doc == new DataObject() { NumericField = doc.NumericField, StringField = doc.StringField }))
};
this.ExecuteTestSuite(inputs);
}
Expand Down
9 changes: 3 additions & 6 deletions ...mos.Tests/BaselineTest/TestBaseline/SqlObjectVisitorBaselineTests.SqlScalarExpression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,7 @@
<Input>
<Description>SqlObjectCreateScalarExpression Empty</Description>
<SqlObject><![CDATA[{
"Properties": [],
"UserSerializer": null
"Properties": []
}]]></SqlObject>
</Input>
<Output>
Expand All @@ -326,8 +325,7 @@
}
}
}
],
"UserSerializer": null
]
}]]></SqlObject>
</Input>
<Output>
Expand Down Expand Up @@ -374,8 +372,7 @@
}
}
}
],
"UserSerializer": null
]
}]]></SqlObject>
</Input>
<Output>
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Pagination/InMemoryContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1501,7 +1501,7 @@ public SqlScalarExpression Visit(CosmosObject cosmosObject)
properties.Add(property);
}

return SqlObjectCreateScalarExpression.Create(null, properties.ToImmutableArray());
return SqlObjectCreateScalarExpression.Create(properties.ToImmutableArray());
}

public SqlScalarExpression Visit(CosmosString cosmosString)
Expand Down
4 changes: 2 additions & 2 deletions .../tests/Microsoft.Azure.Cosmos.Tests/Query/OfflineEngine/AggregateProjectionTransformer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ public override SqlScalarExpression Visit(SqlObjectCreateScalarExpression sqlObj
properties.Add(SqlObjectProperty.Create(property.Name, property.Value.Accept(this)));
}

return SqlObjectCreateScalarExpression.Create(null, properties.ToImmutableArray());
return SqlObjectCreateScalarExpression.Create(properties.ToImmutableArray());
}

public override SqlScalarExpression Visit(SqlParameterRefScalarExpression scalarExpression)
Expand Down Expand Up @@ -402,7 +402,7 @@ public SqlScalarExpression Visit(CosmosObject cosmosObject)
properties.Add(property);
}

return SqlObjectCreateScalarExpression.Create(null, properties.ToImmutableArray());
return SqlObjectCreateScalarExpression.Create(properties.ToImmutableArray());
}

public SqlScalarExpression Visit(CosmosString cosmosString)
Expand Down
2 changes: 1 addition & 1 deletion ...ests/Microsoft.Azure.Cosmos.Tests/Query/OfflineEngineTests/JTokenToSqlScalarExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public static SqlScalarExpression Convert(JToken token)
properties.Add(property);
}

return SqlObjectCreateScalarExpression.Create(null, properties.ToArray());
return SqlObjectCreateScalarExpression.Create(properties.ToArray());
}

case JTokenType.String:
Expand Down
2 changes: 1 addition & 1 deletion ...s/Microsoft.Azure.Cosmos.Tests/Query/OfflineEngineTests/ScalarExpressionEvaluatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public void SqlBinaryScalarExpressionTest()

SqlArrayCreateScalarExpression arrayCreateScalarExpresion1 = SqlArrayCreateScalarExpression.Create();
SqlArrayCreateScalarExpression arrayCreateScalarExpresion2 = SqlArrayCreateScalarExpression.Create(five);
SqlObjectCreateScalarExpression objectCreateScalarExpression = SqlObjectCreateScalarExpression.Create(null);
SqlObjectCreateScalarExpression objectCreateScalarExpression = SqlObjectCreateScalarExpression.Create();

SqlBinaryScalarExpression fivePlusThree = SqlBinaryScalarExpression.Create(SqlBinaryScalarOperatorKind.Add, five, three);
AssertEvaluation(CosmosNumber64.Create(3 + 5), fivePlusThree);
Expand Down
4 changes: 1 addition & 3 deletions ...ure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/SqlObjects/SqlObjectVisitorBaselineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,20 +180,18 @@ public void SqlScalarExpression()

inputs.Add(new SqlObjectVisitorInput(
nameof(SqlObjectCreateScalarExpression) + " Empty",
SqlObjectCreateScalarExpression.Create(null)));
SqlObjectCreateScalarExpression.Create()));

inputs.Add(new SqlObjectVisitorInput(
nameof(SqlObjectCreateScalarExpression) + " OneProperty",
SqlObjectCreateScalarExpression.Create(
null,
SqlObjectProperty.Create(
SqlPropertyName.Create("Hello"),
SqlLiteralScalarExpression.Create(SqlStringLiteral.Create("World"))))));

inputs.Add(new SqlObjectVisitorInput(
nameof(SqlObjectCreateScalarExpression) + " MultiProperty",
SqlObjectCreateScalarExpression.Create(
null,
SqlObjectProperty.Create(
SqlPropertyName.Create("Hello"),
SqlLiteralScalarExpression.Create(SqlStringLiteral.Create("World"))),
Expand Down