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 non streaming OrderByCrossPartitionQueryPipelineStage to remove state and handle splits #4493

Merged
merged 5 commits into from
May 17, 2024
Merged

Query: Fixes non streaming OrderByCrossPartitionQueryPipelineStage to remove state and handle splits #4493

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c47dddc
simplify OrderByCrossPartitionQueryPipelineStage to remove state and …
neildsh May 13, 2024
7698978
Add more test coverage for splits/merge and request charge
neildsh May 15, 2024
01ae3d6
Add more test coverage for splits
neildsh May 16, 2024
9faa445
incorporate code review feedback
neildsh May 17, 2024
6994ada
Merge branch 'master' into users/ndeshpan/simplifynonStreamingOrderBy
neildsh May 17, 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
32 changes: 32 additions & 0 deletions ...oft.Azure.Cosmos/src/Query/Core/Pipeline/CrossPartition/OrderBy/BufferedOrderByResults.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// ------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All rights reserved.
// ------------------------------------------------------------

namespace Microsoft.Azure.Cosmos.Query.Core.Pipeline.CrossPartition.OrderBy
{
using System;
using System.Collections.Generic;

internal sealed class BufferedOrderByResults
{
public IEnumerator<OrderByQueryResult> Enumerator { get; }

public int Count { get; }

public double TotalRequestCharge { get; }

public QueryPageParameters QueryPageParameters { get; }

public BufferedOrderByResults(
IEnumerator<OrderByQueryResult> enumerator,
int itemCount,
double totalRequestCharge,
QueryPageParameters queryPageParameters)
{
this.Enumerator = enumerator ?? throw new ArgumentNullException(nameof(enumerator));
this.Count = itemCount;
this.TotalRequestCharge = totalRequestCharge;
this.QueryPageParameters = queryPageParameters ?? throw new ArgumentNullException(nameof(queryPageParameters));
}
}
}
77 changes: 47 additions & 30 deletions ....Cosmos/src/Query/Core/Pipeline/CrossPartition/OrderBy/OrderByCrossPartitionEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// ------------------------------------------------------------

namespace Microsoft.Azure.Cosmos.Pagination
namespace Microsoft.Azure.Cosmos.Query.Core.Pipeline.CrossPartition.OrderBy
{
using System;
using System.Collections;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Azure.Cosmos.CosmosElements;
using Microsoft.Azure.Cosmos.Pagination;
using Microsoft.Azure.Cosmos.Query.Core.Collections;
using Microsoft.Azure.Cosmos.Query.Core.Monads;
using Microsoft.Azure.Cosmos.Query.Core.Pipeline.CrossPartition.OrderBy;
using Microsoft.Azure.Cosmos.Tracing;

internal sealed class OrderByCrossPartitionEnumerator : IEnumerator<OrderByQueryResult>
Expand All @@ -25,69 +25,86 @@ internal sealed class OrderByCrossPartitionEnumerator : IEnumerator<OrderByQuery

object IEnumerator.Current => this.Current;

public OrderByCrossPartitionEnumerator(PriorityQueue<IEnumerator<OrderByQueryResult>> queue)
private OrderByCrossPartitionEnumerator(PriorityQueue<IEnumerator<OrderByQueryResult>> queue)
{
this.queue = queue ?? throw new ArgumentNullException(nameof(queue));
}

public static async Task<(IEnumerator<OrderByQueryResult> orderbyQueryResultEnumerator, double totalRequestCharge)> CreateAsync(
IEnumerable<OrderByQueryPartitionRangePageAsyncEnumerator> enumerators,
public static async Task<BufferedOrderByResults> CreateAsync(
ITracingAsyncEnumerator<TryCatch<OrderByQueryPage>> enumerator,
IComparer<OrderByQueryResult> comparer,
int levelSize,
ITrace trace,
CancellationToken cancellationToken)
{
if (enumerators == null)
if (enumerator == null)
{
throw new ArgumentNullException(nameof(enumerators));
throw new ArgumentNullException(nameof(enumerator));
}

if (comparer == null)
{
throw new ArgumentNullException(nameof(comparer));
}

QueryPageParameters queryPageParameters = null;
double totalRequestCharge = 0;
int bufferedItemCount = 0;
EnumeratorComparer enumeratorComparer = new EnumeratorComparer(comparer);
PriorityQueue<IEnumerator<OrderByQueryResult>> queue = new PriorityQueue<IEnumerator<OrderByQueryResult>>(enumeratorComparer);
foreach (ITracingAsyncEnumerator<TryCatch<OrderByQueryPage>> enumerator in enumerators)
while (await enumerator.MoveNextAsync(trace, cancellationToken))
{
while (await enumerator.MoveNextAsync(trace, cancellationToken))
TryCatch<OrderByQueryPage> currentPage = enumerator.Current;
if (currentPage.Failed)
{
TryCatch<OrderByQueryPage> currentPage = enumerator.Current;
if (currentPage.Failed)
{
throw currentPage.Exception;
}
throw currentPage.Exception;
}

totalRequestCharge += currentPage.Result.RequestCharge;
IReadOnlyList<CosmosElement> page = currentPage.Result.Page.Documents;
if (queryPageParameters == null)
{
queryPageParameters = new QueryPageParameters(
activityId: currentPage.Result.ActivityId,
cosmosQueryExecutionInfo: currentPage.Result.Page.CosmosQueryExecutionInfo,
distributionPlanSpec: currentPage.Result.Page.DistributionPlanSpec,
additionalHeaders: currentPage.Result.AdditionalHeaders);
}

if (page.Count > 0)
{
PageEnumerator pageEnumerator = new PageEnumerator(page);
pageEnumerator.MoveNext();
totalRequestCharge += currentPage.Result.RequestCharge;
IReadOnlyList<CosmosElement> page = currentPage.Result.Page.Documents;
bufferedItemCount += page.Count;

if (page.Count > 0)
{
PageEnumerator pageEnumerator = new PageEnumerator(page);
pageEnumerator.MoveNext();

queue.Enqueue(pageEnumerator);
queue.Enqueue(pageEnumerator);

if (queue.Count >= levelSize)
{
OrderByCrossPartitionEnumerator newEnumerator = new OrderByCrossPartitionEnumerator(queue);
newEnumerator.MoveNext();
if (queue.Count >= levelSize)
{
OrderByCrossPartitionEnumerator newEnumerator = new OrderByCrossPartitionEnumerator(queue);
newEnumerator.MoveNext();

queue = new PriorityQueue<IEnumerator<OrderByQueryResult>>(enumeratorComparer);
queue.Enqueue(newEnumerator);
}
queue = new PriorityQueue<IEnumerator<OrderByQueryResult>>(enumeratorComparer);
queue.Enqueue(newEnumerator);
}
}
}

if (queue.Count == 0)
{
return (EmptyEnumerator.Instance, totalRequestCharge);
return new BufferedOrderByResults(
EmptyEnumerator.Instance,
itemCount: 0,
totalRequestCharge,
queryPageParameters);
}

return (new OrderByCrossPartitionEnumerator(queue), totalRequestCharge);
return new BufferedOrderByResults(
new OrderByCrossPartitionEnumerator(queue),
bufferedItemCount,
totalRequestCharge,
queryPageParameters);
}

public bool MoveNext()
Expand Down
Loading
Loading