You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2018/02/11 03:00:38 UTC
jclouds git commit: JCLOUDS-912: Use simpleUpload in GCS BlobStore MPU
Repository: jclouds
Updated Branches:
refs/heads/master 3ab335e77 -> 88c84af87
JCLOUDS-912: Use simpleUpload in GCS BlobStore MPU
This works around a regression with InputStream payloads that I cannot
track down. Using simpleUpload instead of multipartUpload is more
optimal since the former avoids creating a multipart form request.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/88c84af8
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/88c84af8
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/88c84af8
Branch: refs/heads/master
Commit: 88c84af8788116be2b1f492c3314e07b493dc6f2
Parents: 3ab335e
Author: Andrew Gaul <ga...@apache.org>
Authored: Sat Feb 10 18:31:59 2018 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sat Feb 10 18:42:36 2018 -0800
----------------------------------------------------------------------
.../blobstore/GoogleCloudStorageBlobStore.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/88c84af8/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java
----------------------------------------------------------------------
diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java
index a5f1338..989a316 100644
--- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java
+++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GoogleCloudStorageBlobStore.java
@@ -66,6 +66,7 @@ import org.jclouds.googlecloudstorage.domain.templates.BucketTemplate;
import org.jclouds.googlecloudstorage.domain.templates.ComposeObjectTemplate;
import org.jclouds.googlecloudstorage.domain.templates.ObjectAccessControlsTemplate;
import org.jclouds.googlecloudstorage.domain.templates.ObjectTemplate;
+import org.jclouds.googlecloudstorage.options.InsertObjectOptions;
import org.jclouds.googlecloudstorage.options.ListObjectOptions;
import org.jclouds.http.HttpResponseException;
import org.jclouds.io.ContentMetadata;
@@ -422,11 +423,8 @@ public final class GoogleCloudStorageBlobStore extends BaseBlobStore {
public MultipartPart uploadMultipartPart(MultipartUpload mpu, int partNumber, Payload payload) {
String partName = getMPUPartName(mpu, partNumber);
long partSize = payload.getContentMetadata().getContentLength();
- ObjectTemplate template = blobMetadataToObjectTemplate.apply(mpu.blobMetadata())
- .name(partName)
- .size(partSize);
- GoogleCloudStorageObject object = api.getObjectApi().multipartUpload(
- mpu.containerName(), template, payload);
+ GoogleCloudStorageObject object = api.getObjectApi().simpleUpload(
+ mpu.containerName(), "application/unknown", partSize, payload, new InsertObjectOptions().name(partName));
return MultipartPart.create(partNumber, partSize, object.etag(), object.updated());
}