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

Jump to bottom

Query: Fixes NotImplementedException in OrderByCrossPartitionQueryPipelineStage #2437

Merged
merged 6 commits into from
Apr 30, 2021
Merged

Query: Fixes NotImplementedException in OrderByCrossPartitionQueryPipelineStage #2437

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e0e1c29
Dont throw NotImplementedException on cassandra types
neildsh Apr 29, 2021
52db6b7
Add more test coverage for OrderByCorssPartitionQueryPipelineStage
neildsh Apr 30, 2021
fdcb62f
Add tests for multiple continuation tokens and multi item order by to…
neildsh Apr 30, 2021
b64374a
"not" -> "NOT"
neildsh Apr 30, 2021
2a078f9
remove gratuitous inner class
neildsh Apr 30, 2021
7601d50
Merge branch 'master' into users/ndeshpan/cassandra_binary
j82w Apr 30, 2021
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
29 changes: 27 additions & 2 deletions ...src/Query/Core/Pipeline/CrossPartition/OrderBy/OrderByCrossPartitionQueryPipelineStage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,12 @@ private static class IsSystemFunctions
public const string Object = "IS_OBJECT";
}

private static class ExtendedTypesIsSystemFunctions
neildsh marked this conversation as resolved.
Show resolved Hide resolved
{
public const string Undefined = "not IS_DEFINED";
neildsh marked this conversation as resolved.
Show resolved Hide resolved
public const string Defined = "IS_DEFINED";
}

private static readonly ReadOnlyMemory<string> SystemFunctionSortOrder = new string[]
{
IsSystemFunctions.Undefined,
Expand All @@ -1186,6 +1192,12 @@ private static class IsSystemFunctions
IsSystemFunctions.Object,
};

private static readonly ReadOnlyMemory<string> ExtendedTypesSystemFunctionSortOrder = new string[]
{
ExtendedTypesIsSystemFunctions.Undefined,
ExtendedTypesIsSystemFunctions.Defined
};

private static class SortOrder
{
public const int Undefined = 0;
Expand All @@ -1197,6 +1209,12 @@ private static class SortOrder
public const int Object = 6;
}

private static class ExtendedTypesSortOrder
{
public const int Undefined = 0;
public const int Defined = 1;
}

private CosmosElementToIsSystemFunctionsVisitor()
{
}
Expand All @@ -1208,7 +1226,7 @@ public ReadOnlyMemory<string> Visit(CosmosArray cosmosArray, bool isAscending)

public ReadOnlyMemory<string> Visit(CosmosBinary cosmosBinary, bool isAscending)
{
throw new NotImplementedException();
return GetExtendedTypesIsDefinedFunctions(ExtendedTypesSortOrder.Defined, isAscending);
}

public ReadOnlyMemory<string> Visit(CosmosBoolean cosmosBoolean, bool isAscending)
Expand All @@ -1218,7 +1236,7 @@ public ReadOnlyMemory<string> Visit(CosmosBoolean cosmosBoolean, bool isAscendin

public ReadOnlyMemory<string> Visit(CosmosGuid cosmosGuid, bool isAscending)
{
throw new NotImplementedException();
return GetExtendedTypesIsDefinedFunctions(ExtendedTypesSortOrder.Defined, isAscending);
}

public ReadOnlyMemory<string> Visit(CosmosNull cosmosNull, bool isAscending)
Expand Down Expand Up @@ -1250,6 +1268,13 @@ private static ReadOnlyMemory<string> GetIsDefinedFunctions(int index, bool isAs
{
return isAscending ? SystemFunctionSortOrder.Slice(index + 1) : SystemFunctionSortOrder.Slice(start: 0, index);
}

private static ReadOnlyMemory<string> GetExtendedTypesIsDefinedFunctions(int index, bool isAscending)
{
return isAscending ?
ExtendedTypesSystemFunctionSortOrder.Slice(index + 1) :
ExtendedTypesSystemFunctionSortOrder.Slice(start: 0, index);
}
}

private readonly struct ComparisionWithUndefinedFilters
Expand Down
71 changes: 44 additions & 27 deletions ...crosoft.Azure.Cosmos.Tests/Query/Pipeline/OrderByCrossPartitionQueryPipelineStageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace Microsoft.Azure.Cosmos.Tests.Query.Pipeline
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Azure.Cosmos.CosmosElements;
using Microsoft.Azure.Cosmos.CosmosElements.Numbers;
using Microsoft.Azure.Cosmos.Pagination;
using Microsoft.Azure.Cosmos.Query.Core;
using Microsoft.Azure.Cosmos.Query.Core.Exceptions;
Expand Down Expand Up @@ -118,36 +119,52 @@ public void MonadicCreate_NonParallelContinuationToken()
public void MonadicCreate_SingleOrderByContinuationToken()
{
Mock<IDocumentContainer> mockDocumentContainer = new Mock<IDocumentContainer>();
Guid guid = Guid.Parse("69D5AB17-C94A-4173-A278-B59D0D9C7C37");
byte[] randomBytes = guid.ToByteArray();
string hexString = PartitionKeyInternal.HexConvert.ToHex(randomBytes, 0, randomBytes.Length);

ParallelContinuationToken parallelContinuationToken = new ParallelContinuationToken(
token: "asdf",
range: new Documents.Routing.Range<string>("A", "B", true, false));

OrderByContinuationToken orderByContinuationToken = new OrderByContinuationToken(
parallelContinuationToken,
new List<OrderByItem>() { new OrderByItem(CosmosObject.Create(new Dictionary<string, CosmosElement>() { { "item", CosmosString.Create("asdf") } })) },
rid: "rid",
skipCount: 42,
filter: "filter");

TryCatch<IQueryPipelineStage> monadicCreate = OrderByCrossPartitionQueryPipelineStage.MonadicCreate(
documentContainer: mockDocumentContainer.Object,
sqlQuerySpec: new SqlQuerySpec("SELECT * FROM c ORDER BY c._ts"),
targetRanges: new List<FeedRangeEpk>() { new FeedRangeEpk(new Range<string>(min: "A", max: "B", isMinInclusive: true, isMaxInclusive: false)) },
partitionKey: null,
orderByColumns: new List<OrderByColumn>()
{
new OrderByColumn("_ts", SortOrder.Ascending)
},
queryPaginationOptions: new QueryPaginationOptions(pageSizeHint: 10),
maxConcurrency: 10,
cancellationToken: default,
continuationToken: CosmosArray.Create(
new List<CosmosElement>()
foreach ((string serializedToken, CosmosElement element) in new (string, CosmosElement)[]
{
("[42, 37]", CosmosArray.Parse("[42, 37]")),
($@"{{C_Binary(""0x{hexString}"")}}", CosmosBinary.Create(new ReadOnlyMemory<byte>(randomBytes))),
("false", CosmosBoolean.Create(false)),
($@"{{C_Guid(""{guid.ToString()}"")}}", CosmosGuid.Create(guid)),
("null", CosmosNull.Create()),
("1", CosmosInt64.Create(1)),
("{\"foo\": false}", CosmosObject.Parse("{\"foo\": false}")),
("asdf", CosmosString.Create("asdf"))
})
{
ParallelContinuationToken parallelContinuationToken = new ParallelContinuationToken(
token: serializedToken,
range: new Documents.Routing.Range<string>("A", "B", true, false));

OrderByContinuationToken orderByContinuationToken = new OrderByContinuationToken(
parallelContinuationToken,
new List<OrderByItem>() { new OrderByItem(CosmosObject.Create(new Dictionary<string, CosmosElement>() { { "item", element} })) },
rid: "rid",
skipCount: 42,
filter: "filter");

TryCatch<IQueryPipelineStage> monadicCreate = OrderByCrossPartitionQueryPipelineStage.MonadicCreate(
documentContainer: mockDocumentContainer.Object,
sqlQuerySpec: new SqlQuerySpec("SELECT * FROM c ORDER BY c.item"),
targetRanges: new List<FeedRangeEpk>() { new FeedRangeEpk(new Range<string>(min: "A", max: "B", isMinInclusive: true, isMaxInclusive: false)) },
partitionKey: null,
orderByColumns: new List<OrderByColumn>()
{
new OrderByColumn("item", SortOrder.Ascending)
},
queryPaginationOptions: new QueryPaginationOptions(pageSizeHint: 10),
maxConcurrency: 10,
cancellationToken: default,
continuationToken: CosmosArray.Create(
new List<CosmosElement>()
{
OrderByContinuationToken.ToCosmosElement(orderByContinuationToken)
}));
Assert.IsTrue(monadicCreate.Succeeded);
}));
Assert.IsTrue(monadicCreate.Succeeded);
}
}

[TestMethod]
Expand Down