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

No content on Response: Add the ability to have operation return no content from Cosmos DB #1439

Merged
merged 16 commits into from
May 8, 2020
Merged

No content on Response: Add the ability to have operation return no content from Cosmos DB #1439

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a6ef17f
Minimal Response: Add the ability to no content on response
Apr 27, 2020
63b6abf
Updated contract changes
Apr 27, 2020
c7ad081
Blocked query, updated documentation, updated tests
Apr 28, 2020
70dc2e9
Merge branch 'master' into users/jawilley/feature/minimalResponse
j82w Apr 28, 2020
0157249
Updated contract changes
Apr 28, 2020
b9c302f
Merge branch 'users/jawilley/feature/minimalResponse' of https://gith…
Apr 28, 2020
ebab57e
Added separate request options for read vs write.
May 4, 2020
4e53a80
Merge to latest
May 4, 2020
0d77705
Removed virtual, added tests for etag
May 5, 2020
e0a28bb
Removed virtual and updated comments
May 5, 2020
4d7ee95
Merge remote-tracking branch 'origin/master' into users/jawilley/feat…
May 5, 2020
9a9e769
Made NoContentResponseOnRead internal
May 6, 2020
cd0e191
Update contract change
May 6, 2020
03d1a17
Updated naming
May 7, 2020
754d3ba
Update contract
May 7, 2020
645c54d
Fixed logic to match new wording
May 7, 2020
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
Prev Previous commit
Next Next commit
Updated naming
  • Loading branch information
Jake Willey committed May 7, 2020
commit 03d1a175208ae667061363d2a29e2bc3039a23a9
4 changes: 2 additions & 2 deletions Microsoft.Azure.Cosmos/src/Batch/ItemBatchOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ internal static Result WriteOperation(ref RowWriter writer, TypeArgument typeArg
}

if (ItemRequestOptions.ShouldSetNoContentHeader(
options.NoContentResponseOnWrite,
options.NoContentResponseOnRead,
options.EnableContentResponseOnWrite,
options.EnableContentResponseOnRead,
operation.OperationType))
{
r = writer.WriteBool("minimalReturnPreference", true);
Expand Down
8 changes: 4 additions & 4 deletions Microsoft.Azure.Cosmos/src/Batch/TransactionalBatchItemRequestOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class TransactionalBatchItemRequestOptions : RequestOptions
/// <remarks>
/// This is optimal for workloads where the returned resource is not used.
/// </remarks>
public bool? NoContentResponseOnWrite { get; set; }
public bool? EnableContentResponseOnWrite { get; set; }

/// <summary>
/// Gets or sets the boolean to only return the headers and status code in
Expand All @@ -38,7 +38,7 @@ public class TransactionalBatchItemRequestOptions : RequestOptions
/// <remarks>
/// This is optimal for workloads where the returned resource is not used.
/// </remarks>
internal bool? NoContentResponseOnRead { get; set; }
internal bool? EnableContentResponseOnRead { get; set; }

/// <summary>
/// Options to encrypt properties of the item.
Expand All @@ -62,8 +62,8 @@ internal static TransactionalBatchItemRequestOptions FromItemRequestOptions(Item
batchItemRequestOptions.IfMatchEtag = itemRequestOptions.IfMatchEtag;
batchItemRequestOptions.IfNoneMatchEtag = itemRequestOptions.IfNoneMatchEtag;
batchItemRequestOptions.Properties = itemRequestOptions.Properties;
batchItemRequestOptions.NoContentResponseOnWrite = itemRequestOptions.NoContentResponseOnWrite;
batchItemRequestOptions.NoContentResponseOnRead = itemRequestOptions.NoContentResponseOnRead;
batchItemRequestOptions.EnableContentResponseOnWrite = itemRequestOptions.EnableContentResponseOnWrite;
batchItemRequestOptions.EnableContentResponseOnRead = itemRequestOptions.EnableContentResponseOnRead;
batchItemRequestOptions.IsEffectivePartitionKeyRouting = itemRequestOptions.IsEffectivePartitionKeyRouting;
return batchItemRequestOptions;
}
Expand Down
8 changes: 4 additions & 4 deletions Microsoft.Azure.Cosmos/src/RequestOptions/ItemRequestOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public ConsistencyLevel? ConsistencyLevel
/// <remarks>
/// This is optimal for workloads where the returned resource is not used.
/// </remarks>
public bool? NoContentResponseOnWrite { get; set; }
public bool? EnableContentResponseOnWrite { get; set; }

/// <summary>
/// Gets or sets the boolean to only return the headers and status code in
Expand All @@ -137,7 +137,7 @@ public ConsistencyLevel? ConsistencyLevel
/// <remarks>
/// This is optimal for workloads where the returned resource is not used.
/// </remarks>
internal bool? NoContentResponseOnRead { get; set; }
internal bool? EnableContentResponseOnRead { get; set; }

/// <summary>
/// Options to encrypt properties of the item.
Expand Down Expand Up @@ -175,8 +175,8 @@ internal override void PopulateRequestOptions(RequestMessage request)
RequestOptions.SetSessionToken(request, this.SessionToken);

if (ItemRequestOptions.ShouldSetNoContentHeader(
this.NoContentResponseOnWrite,
this.NoContentResponseOnRead,
this.EnableContentResponseOnWrite,
this.EnableContentResponseOnRead,
request.OperationType))
{
request.Headers.Add(HttpConstants.HttpHeaders.Prefer, HttpConstants.HttpHeaderValues.PreferReturnMinimal);
Expand Down
12 changes: 6 additions & 6 deletions ...oft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosMinimalResponseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public async Task ItemCreateNoResponseTest()
{
ItemRequestOptions requestOptions = new ItemRequestOptions()
{
NoContentResponseOnWrite = true
EnableContentResponseOnWrite = true
};

await this.Validate(
Expand All @@ -64,7 +64,7 @@ public async Task ItemReadNoResponseTest()
{
ItemRequestOptions requestOptions = new ItemRequestOptions()
{
NoContentResponseOnRead = true
EnableContentResponseOnRead = true
};

await this.Validate(
Expand Down Expand Up @@ -114,7 +114,7 @@ public async Task ItemStreamCreateNoResponseTest()
{
ItemRequestOptions requestOptions = new ItemRequestOptions()
{
NoContentResponseOnWrite = true
EnableContentResponseOnWrite = true
};

await this.ValidateItemStream(
Expand All @@ -128,7 +128,7 @@ public async Task ItemStreamReadNoResponseTest()
{
ItemRequestOptions requestOptions = new ItemRequestOptions()
{
NoContentResponseOnRead = true
EnableContentResponseOnRead = true
};

await this.ValidateItemStream(
Expand Down Expand Up @@ -197,7 +197,7 @@ public async Task ItemBatchNoResponseTest()
{
TransactionalBatchItemRequestOptions requestOptions = new TransactionalBatchItemRequestOptions()
{
NoContentResponseOnWrite = true
EnableContentResponseOnWrite = true
};

string pkId = "TestBatchId";
Expand Down Expand Up @@ -249,7 +249,7 @@ public async Task ItemBulkNoResponseTest()
{
ItemRequestOptions requestOptions = new ItemRequestOptions()
{
NoContentResponseOnWrite = true
EnableContentResponseOnWrite = true
};

CosmosClient bulkClient = TestCommon.CreateCosmosClient((builder) => builder.WithBulkExecution(true));
Expand Down