Skip to content

Hot fixes for CosmosSerializationOptions and query partition key issues #207

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

Merged
kirankumarkolli merged 3 commits into from
May 9, 2019
Merged

Hot fixes for CosmosSerializationOptions and query partition key issues #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
921f008
Hot fixes for CosmosSerializationOptions and query partition key.
May 8, 2019
2407727
initial commit (#193)
simplynaveen20 May 7, 2019
163fbeb
Fixed formatting
May 9, 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
15 changes: 12 additions & 3 deletions Microsoft.Azure.Cosmos/src/Query/ParallelQuery/ItemProducer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,9 +438,18 @@ private void PopulatePartitionKeyRangeInfo(CosmosRequestMessage request)

if (this.queryContext.ResourceTypeEnum.IsPartitioned())
{
request.ToDocumentServiceRequest().RouteTo(new PartitionKeyRangeIdentity(
this.queryContext.ContainerResourceId,
this.PartitionKeyRange.Id));
// If the request already has the logical partition key,
// then we shouldn't add the physical partition key range id.

bool hasPartitionKey = request.Headers.Get(HttpConstants.HttpHeaders.PartitionKey) != null;
if (!hasPartitionKey)
{
request
.ToDocumentServiceRequest()
.RouteTo(new PartitionKeyRangeIdentity(
this.queryContext.ContainerResourceId,
this.PartitionKeyRange.Id));
}
}
}

Expand Down
8 changes: 5 additions & 3 deletions Microsoft.Azure.Cosmos/src/Resource/QueryResponses/CosmosQueryResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ internal static CosmosQueryResponse CreateResponse(
FeedResponse<CosmosElement> feedResponse,
CosmosSerializationOptions cosmosSerializationOptions)
{
return FeedResponseBinder.ConvertToCosmosQueryResponse(feedResponse, null);
return FeedResponseBinder.ConvertToCosmosQueryResponse(feedResponse, cosmosSerializationOptions);
}

/// <summary>
Expand Down Expand Up @@ -262,8 +262,10 @@ internal static CosmosQueryResponse<TInput> CreateResponse<TInput>(
CosmosQueryResponse<TInput> queryResponse = new CosmosQueryResponse<TInput>(
hasMoreResults: hasMoreResults,
continuationToken: continuationToken,
disallowContinuationTokenMessage: null);
queryResponse.Resources = resources;
disallowContinuationTokenMessage: null)
{
Resources = resources
};
return queryResponse;
}

Expand Down
8 changes: 4 additions & 4 deletions ...soft.Azure.Cosmos.EmulatorTests/CrossPartitionQueryTests.AggregateMixedTypes_baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,13 @@ WHERE c.key = "arrayOnlyKey"]]></Query>
<Query><![CDATA[SELECT VALUE MIN (c.field)
FROM c
WHERE c.key = "oneArrayKey"]]></Query>
<Aggregation><![CDATA[[]]]></Aggregation>
<Aggregation />
</Result>
<Result>
<Query><![CDATA[SELECT VALUE MIN (c.field)
FROM c
WHERE c.key = "oneObjectKey"]]></Query>
<Aggregation><![CDATA[{}]]></Aggregation>
<Aggregation />
</Result>
<Result>
<Query><![CDATA[SELECT VALUE MIN (c.field)
Expand Down Expand Up @@ -291,13 +291,13 @@ WHERE c.key = "arrayOnlyKey"]]></Query>
<Query><![CDATA[SELECT VALUE MAX (c.field)
FROM c
WHERE c.key = "oneArrayKey"]]></Query>
<Aggregation><![CDATA[[]]]></Aggregation>
<Aggregation />
</Result>
<Result>
<Query><![CDATA[SELECT VALUE MAX (c.field)
FROM c
WHERE c.key = "oneObjectKey"]]></Query>
<Aggregation><![CDATA[{}]]></Aggregation>
<Aggregation />
</Result>
<Result>
<Query><![CDATA[SELECT VALUE MAX (c.field)
Expand Down