-
Notifications
You must be signed in to change notification settings - Fork 491
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Query: Adds Distribution for MakeList and MakeSet (#4490)
* added MakeList and MakeSet aggregators * Added MakeList and MakeSet to AggregateQueryTests.cs * Adjust Aggregators * Add Array Aggregate Continuation Token Test * Added group by coverage for MakeList and MakeSet * address comments * cleaning * Refactored test to better detect when to ignore result order * cleaning * cleaning, update baseline * cleaning * removed old comment * cleaning/refactoring * cleaning * Add explicit cases to hit continuation token limit. * Added additional case to GroupBy tests * cleaning * cleaning * cleaning, updated baseline test * cleaning, updated baseline test * Added coverage to QueryPlanBaselineTests.cs * refactored
- Loading branch information
1 parent
272e844
commit 179d9a4
Showing
10 changed files
with
1,466 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,8 @@ internal enum AggregateOperator | |
| { | ||
| Average, | ||
| Count, | ||
| MakeList, | ||
| MakeSet, | ||
| Max, | ||
| Min, | ||
| Sum, | ||
|
|
||
70 changes: 70 additions & 0 deletions
70
Microsoft.Azure.Cosmos/src/Query/Core/Pipeline/Aggregate/Aggregators/MakeListAggregator.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| //------------------------------------------------------------ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| //------------------------------------------------------------ | ||
|
|
||
| namespace Microsoft.Azure.Cosmos.Query.Core.Pipeline.Aggregate.Aggregators | ||
| { | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics; | ||
| using System.Globalization; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using Microsoft.Azure.Cosmos.CosmosElements; | ||
| using Microsoft.Azure.Cosmos.CosmosElements.Numbers; | ||
| using Microsoft.Azure.Cosmos.Query.Core.Exceptions; | ||
| using Microsoft.Azure.Cosmos.Query.Core.Monads; | ||
|
|
||
| internal sealed class MakeListAggregator : IAggregator | ||
| { | ||
| private readonly List<CosmosElement> globalList; | ||
|
|
||
| private MakeListAggregator(CosmosArray initialList) | ||
| { | ||
| this.globalList = new List<CosmosElement>(); | ||
|
|
||
| this.Aggregate(initialList); | ||
| } | ||
|
|
||
| public void Aggregate(CosmosElement localList) | ||
| { | ||
| if (!(localList is CosmosArray cosmosArray)) | ||
| { | ||
| throw new ArgumentException($"{nameof(localList)} must be an array."); | ||
| } | ||
|
|
||
| this.globalList.AddRange(cosmosArray.ToList<CosmosElement>()); | ||
| } | ||
|
|
||
| public CosmosElement GetResult() | ||
| { | ||
| return CosmosArray.Create(this.globalList); | ||
| } | ||
|
|
||
| public static TryCatch<IAggregator> TryCreate(CosmosElement continuationToken) | ||
| { | ||
| CosmosArray partialList; | ||
| if (continuationToken != null) | ||
| { | ||
| if (!(continuationToken is CosmosArray cosmosPartialList)) | ||
| { | ||
| return TryCatch<IAggregator>.FromException( | ||
| new MalformedContinuationTokenException($@"Invalid MakeList continuation token: ""{continuationToken}"".")); | ||
| } | ||
|
|
||
| partialList = cosmosPartialList; | ||
| } | ||
| else | ||
| { | ||
| partialList = CosmosArray.Empty; | ||
| } | ||
|
|
||
| return TryCatch<IAggregator>.FromResult(new MakeListAggregator(initialList: partialList)); | ||
| } | ||
|
|
||
| public CosmosElement GetCosmosElementContinuationToken() | ||
| { | ||
| return this.GetResult(); | ||
| } | ||
| } | ||
| } |
75 changes: 75 additions & 0 deletions
75
Microsoft.Azure.Cosmos/src/Query/Core/Pipeline/Aggregate/Aggregators/MakeSetAggregator.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| //------------------------------------------------------------ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| //------------------------------------------------------------ | ||
|
|
||
| namespace Microsoft.Azure.Cosmos.Query.Core.Pipeline.Aggregate.Aggregators | ||
| { | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics; | ||
| using System.Globalization; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using Microsoft.Azure.Cosmos.CosmosElements; | ||
| using Microsoft.Azure.Cosmos.CosmosElements.Numbers; | ||
| using Microsoft.Azure.Cosmos.Query.Core.Exceptions; | ||
| using Microsoft.Azure.Cosmos.Query.Core.Monads; | ||
|
|
||
| internal sealed class MakeSetAggregator : IAggregator | ||
| { | ||
| private readonly HashSet<CosmosElement> globalSet; | ||
|
|
||
| private MakeSetAggregator(CosmosArray initialSet) | ||
| { | ||
| this.globalSet = new HashSet<CosmosElement>(); | ||
|
|
||
| this.Aggregate(initialSet); | ||
| } | ||
|
|
||
| public void Aggregate(CosmosElement localSet) | ||
| { | ||
| if (!(localSet is CosmosArray cosmosArray)) | ||
| { | ||
| throw new ArgumentException($"{nameof(localSet)} must be an array."); | ||
| } | ||
|
|
||
| this.globalSet.UnionWith(cosmosArray.ToList<CosmosElement>()); | ||
| } | ||
|
|
||
| public CosmosElement GetResult() | ||
| { | ||
| return CosmosArray.Create(this.globalSet); | ||
| } | ||
|
|
||
| public string GetContinuationToken() | ||
| { | ||
| return this.globalSet.ToString(); | ||
| } | ||
|
|
||
| public static TryCatch<IAggregator> TryCreate(CosmosElement continuationToken) | ||
| { | ||
| CosmosArray partialSet; | ||
| if (continuationToken != null) | ||
| { | ||
| if (!(continuationToken is CosmosArray cosmosPartialSet)) | ||
| { | ||
| return TryCatch<IAggregator>.FromException( | ||
| new MalformedContinuationTokenException($@"Invalid MakeSet continuation token: ""{continuationToken}"".")); | ||
| } | ||
|
|
||
| partialSet = cosmosPartialSet; | ||
| } | ||
| else | ||
| { | ||
| partialSet = CosmosArray.Empty; | ||
| } | ||
|
|
||
| return TryCatch<IAggregator>.FromResult(new MakeSetAggregator(initialSet: partialSet)); | ||
| } | ||
|
|
||
| public CosmosElement GetCosmosElementContinuationToken() | ||
| { | ||
| return this.GetResult(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.