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

[Internal] Query : Adds test coverage for custom serializers #4114

Merged
merged 23 commits into from
Oct 18, 2023
Merged

[Internal] Query : Adds test coverage for custom serializers #4114

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3671ddf
initial cleanup
Maya-Painter Oct 8, 2023
5f6c33a
test updates - working
Maya-Painter Oct 10, 2023
a30dd43
cleanup
Maya-Painter Oct 10, 2023
85c9911
more cleanup
Maya-Painter Oct 10, 2023
ac074db
more
Maya-Painter Oct 10, 2023
c1be556
Merge branch 'master' into users/mayapainter/LinqSerialization
Maya-Painter Oct 10, 2023
5dd7bd2
whoops
Maya-Painter Oct 10, 2023
0fdeac5
Add results to basline
Maya-Painter Oct 10, 2023
35af0de
adding payload to xml
Maya-Painter Oct 11, 2023
2d28efc
some generics
Maya-Painter Oct 11, 2023
2155749
cleanup
Maya-Painter Oct 11, 2023
c3357ee
Add datamember serializer
Maya-Painter Oct 11, 2023
f7ee3c0
reorder functions and test fix
Maya-Painter Oct 11, 2023
6590200
tostring() update and add case
Maya-Painter Oct 13, 2023
054031a
fix payload
Maya-Painter Oct 13, 2023
d5aac67
fix datamembertest
Maya-Painter Oct 13, 2023
b6e0a2c
cleanup
Maya-Painter Oct 13, 2023
492e2a2
cleanup
Maya-Painter Oct 13, 2023
79dc4ac
Merge branch 'master' into users/mayapainter/LinqSerialization
Maya-Painter Oct 13, 2023
4a2bc3b
PR comment
Maya-Painter Oct 13, 2023
519ad90
Merge branch 'master' into users/mayapainter/LinqSerialization
Maya-Painter Oct 18, 2023
111fce5
Merge branch 'master' into users/mayapainter/LinqSerialization
Maya-Painter Oct 18, 2023
d5b45b2
Merge branch 'master' into users/mayapainter/LinqSerialization
ealsur Oct 18, 2023
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
15 changes: 5 additions & 10 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 @@ -15,12 +15,10 @@ namespace Microsoft.Azure.Cosmos.Linq
using System.Reflection;
using Microsoft.Azure.Cosmos.CosmosElements;
using Microsoft.Azure.Cosmos.CosmosElements.Numbers;
using Microsoft.Azure.Cosmos.Serializer;
using Microsoft.Azure.Cosmos.Spatial;
using Microsoft.Azure.Cosmos.SqlObjects;
using Microsoft.Azure.Documents;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using static Microsoft.Azure.Cosmos.Linq.FromParameterBindings;

// ReSharper disable UnusedParameter.Local
Expand Down Expand Up @@ -77,10 +75,9 @@ public static class LinqMethods
public const string Where = "Where";
}

private static string SqlRoot = "root";
private static string DefaultParameterName = "v";
private static bool usePropertyRef = false;
private static SqlIdentifier RootIdentifier = SqlIdentifier.Create(SqlRoot);
private static readonly string SqlRoot = "root";
private static readonly string DefaultParameterName = "v";
private static readonly bool usePropertyRef = false;

/// <summary>
/// Toplevel entry point.
Expand Down Expand Up @@ -455,12 +452,12 @@ private static SqlScalarExpression VisitBinary(BinaryExpression inputExpression,
{
if (TryMatchStringCompareTo(methodCallExpression, constantExpression, inputExpression.NodeType))
{
return ExpressionToSql.VisitStringCompareTo(methodCallExpression, constantExpression, inputExpression.NodeType, reverseNodeType, context);
return ExpressionToSql.VisitStringCompareTo(methodCallExpression, inputExpression.NodeType, reverseNodeType, context);
}

if (TryMatchStringCompare(methodCallExpression, constantExpression, inputExpression.NodeType))
{
return ExpressionToSql.VisitStringCompare(methodCallExpression, constantExpression, inputExpression.NodeType, reverseNodeType, context);
return ExpressionToSql.VisitStringCompare(methodCallExpression, inputExpression.NodeType, reverseNodeType, context);
}
}

Expand Down Expand Up @@ -613,7 +610,6 @@ private static bool TryMatchStringCompareTo(MethodCallExpression left, ConstantE

private static SqlScalarExpression VisitStringCompareTo(
MethodCallExpression left,
ConstantExpression right,
ExpressionType compareOperator,
bool reverseNodeType,
TranslationContext context)
Expand Down Expand Up @@ -690,7 +686,6 @@ private static bool TryMatchStringCompare(MethodCallExpression left, ConstantExp

private static SqlScalarExpression VisitStringCompare(
MethodCallExpression left,
ConstantExpression right,
ExpressionType compareOperator,
bool reverseNodeType,
TranslationContext context)
Expand Down
5 changes: 0 additions & 5 deletions Microsoft.Azure.Cosmos/src/Resource/Container/ContainerCore.Items.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ namespace Microsoft.Azure.Cosmos
using Microsoft.Azure.Cosmos.ChangeFeed;
using Microsoft.Azure.Cosmos.ChangeFeed.FeedProcessing;
using Microsoft.Azure.Cosmos.ChangeFeed.Pagination;
using Microsoft.Azure.Cosmos.ChangeFeed.Utils;
using Microsoft.Azure.Cosmos.Common;
using Microsoft.Azure.Cosmos.CosmosElements;
using Microsoft.Azure.Cosmos.Json;
using Microsoft.Azure.Cosmos.Linq;
Expand All @@ -29,11 +27,8 @@ namespace Microsoft.Azure.Cosmos
using Microsoft.Azure.Cosmos.Query.Core.QueryPlan;
using Microsoft.Azure.Cosmos.ReadFeed;
using Microsoft.Azure.Cosmos.ReadFeed.Pagination;
using Microsoft.Azure.Cosmos.Routing;
using Microsoft.Azure.Cosmos.Serializer;
using Microsoft.Azure.Cosmos.Tracing;
using Microsoft.Azure.Documents;
using Microsoft.Azure.Documents.Routing;

/// <summary>
/// Used to perform operations on items. There are two different types of operations.
Expand Down
4 changes: 0 additions & 4 deletions Microsoft.Azure.Cosmos/src/Serializer/CosmosLinqSerializerOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@

namespace Microsoft.Azure.Cosmos
{
using System;
using System.Collections.Generic;
using System.Text;

/// <summary>
/// This class provides a way to configure Linq Serialization Properties
/// </summary>
Expand Down
194 changes: 194 additions & 0 deletions ...tBaseline/LinqTranslationWithCustomSerializerBaseline.TestMemberInitializerDataMember.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
<Results>
<Result>
<Input>
<Description><![CDATA[Filter w/ DataObject initializer with constant value, camelcase = True]]></Description>
<Expression><![CDATA[query.Where(doc => (doc == new DataObjectDataMember() {NumericField = 12, StringField = "12"}))]]></Expression>
Maya-Painter marked this conversation as resolved.
Show resolved Hide resolved
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE root
FROM root
WHERE (root = {"NumericField": 12, "StringField": "12", "id": null, "Pk": null})]]></SqlQuery>
<InputData><![CDATA[[
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-False\",\"Pk\":\"Test\"}"
]]]></InputData>
<Results><![CDATA[[]]]></Results>
</Output>
</Result>
<Result>
<Input>
<Description><![CDATA[Select w/ DataObject initializer, camelcase = True]]></Description>
<Expression><![CDATA[query.Select(doc => new DataObjectDataMember() {NumericField = 12, StringField = "12"})]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE {"NumericField": 12, "StringField": "12", "id": null, "Pk": null}
FROM root]]></SqlQuery>
<InputData><![CDATA[[
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-False\",\"Pk\":\"Test\"}"
]]]></InputData>
<Results><![CDATA[[
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}"
]]]></Results>
</Output>
</Result>
<Result>
<Input>
<Description><![CDATA[Deeper than top level reference, camelcase = True]]></Description>
<Expression><![CDATA[query.Select(doc => IIF((doc.NumericField > 12), new DataObjectDataMember() {NumericField = 12, StringField = "12"}, new DataObjectDataMember() {NumericField = 12, StringField = "12"}))]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE ((root["numericField"] > 12) ? {"NumericField": 12, "StringField": "12", "id": null, "Pk": null} : {"NumericField": 12, "StringField": "12", "id": null, "Pk": null})
FROM root]]></SqlQuery>
<InputData><![CDATA[[
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-False\",\"Pk\":\"Test\"}"
]]]></InputData>
<Results><![CDATA[[
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}"
]]]></Results>
</Output>
</Result>
<Result>
<Input>
<Description><![CDATA[Filter w/ DataObject initializer with member initialization, camelcase = True]]></Description>
<Expression><![CDATA[query.Where(doc => (doc == new DataObjectDataMember() {NumericField = doc.NumericField, StringField = doc.StringField})).Select(b => "A")]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE "A"
FROM root
WHERE (root = {"numericField": root["numericField"], "stringField": root["stringField"]})]]></SqlQuery>
<InputData><![CDATA[[
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-False\",\"Pk\":\"Test\"}"
]]]></InputData>
<Results><![CDATA[[]]]></Results>
</Output>
</Result>
<Result>
<Input>
<Description><![CDATA[Filter w/ DataObject initializer with constant value, camelcase = False]]></Description>
<Expression><![CDATA[query.Where(doc => (doc == new DataObjectDataMember() {NumericField = 12, StringField = "12"}))]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE root
FROM root
WHERE (root = {"NumericField": 12, "StringField": "12", "id": null, "Pk": null})]]></SqlQuery>
<InputData><![CDATA[[
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-False\",\"Pk\":\"Test\"}"
]]]></InputData>
<Results><![CDATA[[]]]></Results>
</Output>
</Result>
<Result>
<Input>
<Description><![CDATA[Select w/ DataObject initializer, camelcase = False]]></Description>
<Expression><![CDATA[query.Select(doc => new DataObjectDataMember() {NumericField = 12, StringField = "12"})]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE {"NumericField": 12, "StringField": "12", "id": null, "Pk": null}
FROM root]]></SqlQuery>
<InputData><![CDATA[[
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-False\",\"Pk\":\"Test\"}"
]]]></InputData>
<Results><![CDATA[[
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}"
]]]></Results>
</Output>
</Result>
<Result>
<Input>
<Description><![CDATA[Deeper than top level reference, camelcase = False]]></Description>
<Expression><![CDATA[query.Select(doc => IIF((doc.NumericField > 12), new DataObjectDataMember() {NumericField = 12, StringField = "12"}, new DataObjectDataMember() {NumericField = 12, StringField = "12"}))]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE ((root["NumericField"] > 12) ? {"NumericField": 12, "StringField": "12", "id": null, "Pk": null} : {"NumericField": 12, "StringField": "12", "id": null, "Pk": null})
FROM root]]></SqlQuery>
<InputData><![CDATA[[
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-False\",\"Pk\":\"Test\"}"
]]]></InputData>
<Results><![CDATA[[
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}",
"{\"NumericField\":12.0,\"StringField\":\"12\",\"id\":null,\"Pk\":null}"
]]]></Results>
</Output>
</Result>
<Result>
<Input>
<Description><![CDATA[Filter w/ DataObject initializer with member initialization, camelcase = False]]></Description>
<Expression><![CDATA[query.Where(doc => (doc == new DataObjectDataMember() {NumericField = doc.NumericField, StringField = doc.StringField})).Select(b => "A")]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE "A"
FROM root
WHERE (root = {"NumericField": root["NumericField"], "StringField": root["StringField"]})]]></SqlQuery>
<InputData><![CDATA[[
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-True\",\"Pk\":\"Test\"}",
"{\"NumericField\":0.0,\"StringField\":\"0\",\"id\":\"0-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":1.0,\"StringField\":\"1\",\"id\":\"1-False\",\"Pk\":\"Test\"}",
"{\"NumericField\":2.0,\"StringField\":\"2\",\"id\":\"2-False\",\"Pk\":\"Test\"}"
]]]></InputData>
<Results><![CDATA[[]]]></Results>
</Output>
</Result>
</Results>
Loading
Loading