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

Storage: Give users the ability to disable gzip content encoding to increase throughput #4170

Merged
merged 8 commits into from
Dec 5, 2018
Merged

Storage: Give users the ability to disable gzip content encoding to increase throughput #4170

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d2a2177
3822: Added BlobTargetOption for user to set disabledGzipContent true
Dec 3, 2018
75b8a55
3822: Changed method comment
Dec 3, 2018
1026169
3822: Changed method comment with more explanation
Dec 3, 2018
bae0e48
3822: Fixed comments after review. Added unit test
Dec 4, 2018
9d7990c
Merge branch 'master' into 3822
chingor13 Dec 4, 2018
f03e539
3822: Fixed formatting errors in Storage class
Dec 5, 2018
c715655
Merge branch '3822' of https://github.com/andrey-qlogic/google-cloud-…
Dec 5, 2018
5f53615
3822: Fixed formatting errors in StorageImplTest class
Dec 5, 2018
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
8 changes: 8 additions & 0 deletions ...le-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,14 @@ public static BlobTargetOption metagenerationNotMatch() {
return new BlobTargetOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH);
}

/**
* Returns an option for blob's data disabledGzipContent. If this option is used,
* the request will create a blob with disableGzipContent; at present, this is only for upload.
*/
public static BlobTargetOption disableGzipContent() {
return new BlobTargetOption(StorageRpc.Option.IF_DISABLE_GZIP_CONTENT, true);
}
andrey-qlogic marked this conversation as resolved.
Show resolved Hide resolved

/**
* Returns an option to set a customer-supplied AES256 key for server-side encryption of the
* blob.
Expand Down
4 changes: 4 additions & 0 deletions ...ts/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.google.cloud.storage.spi.v1;

import static com.google.cloud.storage.spi.v1.StorageRpc.Option.IF_DISABLE_GZIP_CONTENT;

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Preconditions.checkArgument;
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
Expand Down Expand Up @@ -287,6 +288,9 @@ public StorageObject create(
storageObject,
new InputStreamContent(storageObject.getContentType(), content));
insert.getMediaHttpUploader().setDirectUploadEnabled(true);
Boolean disableGzipContent = Option.IF_DISABLE_GZIP_CONTENT.getBoolean(options);
if (disableGzipContent != null)
insert.getMediaHttpUploader().setDisableGZipContent(disableGzipContent);
setEncryptionHeaders(insert.getRequestHeaders(), ENCRYPTION_KEY_PREFIX, options);
return insert
.setProjection(DEFAULT_PROJECTION)
Expand Down
1 change: 1 addition & 0 deletions ...lients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ enum Option {
IF_SOURCE_METAGENERATION_NOT_MATCH("ifSourceMetagenerationNotMatch"),
IF_SOURCE_GENERATION_MATCH("ifSourceGenerationMatch"),
IF_SOURCE_GENERATION_NOT_MATCH("ifSourceGenerationNotMatch"),
IF_DISABLE_GZIP_CONTENT("disableGzipContent"),
PREFIX("prefix"),
MAX_RESULTS("maxResults"),
PAGE_TOKEN("pageToken"),
Expand Down