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

TryExecuteQuery #837

Merged
merged 14 commits into from
Oct 24, 2019
Merged

TryExecuteQuery #837

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9ac708c
allowed for retrieval of query plan without exception
bchong95 Sep 20, 2019
812ff17
wired query plan through the stack
bchong95 Sep 20, 2019
46f665b
wired a try execute function
bchong95 Sep 20, 2019
33d5243
added test
bchong95 Sep 20, 2019
7d4e4fc
resolved iteration comments
bchong95 Oct 2, 2019
bdf918f
merged
bchong95 Oct 2, 2019
602869d
merged
bchong95 Oct 7, 2019
16d7ba1
removed contracts
bchong95 Oct 7, 2019
f83907d
added GROUP BY support
bchong95 Oct 8, 2019
c57a684
resolved iteration comments
bchong95 Oct 8, 2019
c267972
added try execute query
bchong95 Oct 19, 2019
01cffef
added back methods that require private members
bchong95 Oct 22, 2019
876edb3
merged
bchong95 Oct 23, 2019
83402f7
merged
bchong95 Oct 23, 2019
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
83 changes: 52 additions & 31 deletions Microsoft.Azure.Cosmos/src/Query/Core/ExecutionContext/CosmosQueryExecutionContextFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,50 +156,70 @@ private async Task<CosmosQueryExecutionContext> CreateItemQueryExecutionContextA
this.CosmosQueryContext.ContainerResourceId = containerQueryProperties.ResourceId;

PartitionedQueryExecutionInfo partitionedQueryExecutionInfo;
if (this.CosmosQueryContext.QueryClient.ByPassQueryParsing())
if (this.inputParameters.PartitionedQueryExecutionInfo != null)
{
// For non-Windows platforms(like Linux and OSX) in .NET Core SDK, we cannot use ServiceInterop, so need to bypass in that case.
// We are also now bypassing this for 32 bit host process running even on Windows as there are many 32 bit apps that will not work without this
partitionedQueryExecutionInfo = await QueryPlanRetriever.GetQueryPlanThroughGatewayAsync(
this.CosmosQueryContext.QueryClient,
this.inputParameters.SqlQuerySpec,
this.CosmosQueryContext.ResourceLink,
cancellationToken);
partitionedQueryExecutionInfo = this.inputParameters.PartitionedQueryExecutionInfo;
}
else
{
//todo:elasticcollections this may rely on information from collection cache which is outdated
//if collection is deleted/created with same name.
//need to make it not rely on information from collection cache.
Documents.PartitionKeyDefinition partitionKeyDefinition;
object partitionKeyDefinitionObject;
if (this.inputParameters.Properties != null
&& this.inputParameters.Properties.TryGetValue(InternalPartitionKeyDefinitionProperty, out partitionKeyDefinitionObject))
if (this.CosmosQueryContext.QueryClient.ByPassQueryParsing())
{
if (partitionKeyDefinitionObject is Documents.PartitionKeyDefinition definition)
// For non-Windows platforms(like Linux and OSX) in .NET Core SDK, we cannot use ServiceInterop, so need to bypass in that case.
// We are also now bypassing this for 32 bit host process running even on Windows as there are many 32 bit apps that will not work without this
partitionedQueryExecutionInfo = await QueryPlanRetriever.GetQueryPlanThroughGatewayAsync(
this.CosmosQueryContext.QueryClient,
this.inputParameters.SqlQuerySpec,
this.CosmosQueryContext.ResourceLink,
cancellationToken);
}
else
{
//todo:elasticcollections this may rely on information from collection cache which is outdated
//if collection is deleted/created with same name.
//need to make it not rely on information from collection cache.
Documents.PartitionKeyDefinition partitionKeyDefinition;
object partitionKeyDefinitionObject;
if (this.inputParameters.Properties != null
&& this.inputParameters.Properties.TryGetValue(InternalPartitionKeyDefinitionProperty, out partitionKeyDefinitionObject))
{
partitionKeyDefinition = definition;
if (partitionKeyDefinitionObject is Documents.PartitionKeyDefinition definition)
{
partitionKeyDefinition = definition;
}
else
{
throw new ArgumentException(
"partitionkeydefinition has invalid type",
nameof(partitionKeyDefinitionObject));
}
}
else
{
throw new ArgumentException(
"partitionkeydefinition has invalid type",
nameof(partitionKeyDefinitionObject));
partitionKeyDefinition = containerQueryProperties.PartitionKeyDefinition;
}
}
else
{
partitionKeyDefinition = containerQueryProperties.PartitionKeyDefinition;
}

partitionedQueryExecutionInfo = await QueryPlanRetriever.GetQueryPlanWithServiceInteropAsync(
this.CosmosQueryContext.QueryClient,
this.inputParameters.SqlQuerySpec,
partitionKeyDefinition,
this.inputParameters.PartitionKey != null,
cancellationToken);
partitionedQueryExecutionInfo = await QueryPlanRetriever.GetQueryPlanWithServiceInteropAsync(
this.CosmosQueryContext.QueryClient,
this.inputParameters.SqlQuerySpec,
partitionKeyDefinition,
this.inputParameters.PartitionKey != null,
cancellationToken);
}
}

return await this.CreateFromPartitionedQuerExecutionInfoAsync(
partitionedQueryExecutionInfo,
containerQueryProperties,
cancellationToken);
}

public async Task<CosmosQueryExecutionContext> CreateFromPartitionedQuerExecutionInfoAsync(
PartitionedQueryExecutionInfo partitionedQueryExecutionInfo,
ContainerQueryProperties containerQueryProperties,
CancellationToken cancellationToken = default(CancellationToken))
{
cancellationToken.ThrowIfCancellationRequested();

List<Documents.PartitionKeyRange> targetRanges = await CosmosQueryExecutionContextFactory.GetTargetPartitionKeyRangesAsync(
this.CosmosQueryContext.QueryClient,
this.CosmosQueryContext.ResourceLink.OriginalString,
Expand Down Expand Up @@ -415,6 +435,7 @@ public struct InputParameters
internal int? MaxBufferedItemCount { get; set; }
internal PartitionKey? PartitionKey { get; set; }
internal IDictionary<string, object> Properties { get; set; }
internal PartitionedQueryExecutionInfo PartitionedQueryExecutionInfo { get; set; }
}
}
}
Loading