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 2016/06/02 14:22:47 UTC
jclouds git commit: Revert "Handle when total length is less than
part length"
Repository: jclouds
Updated Branches:
refs/heads/master bc1f12b7b -> d983d8d0a
Revert "Handle when total length is less than part length"
This reverts commit bc1f12b7bdf9dc7a4f09e50b887fe37fb5859c27.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/d983d8d0
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/d983d8d0
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/d983d8d0
Branch: refs/heads/master
Commit: d983d8d0a7bc8aab94701a5dbcd2f5771adb27f8
Parents: bc1f12b
Author: Andrew Gaul <ga...@apache.org>
Authored: Thu Jun 2 07:21:48 2016 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Thu Jun 2 07:21:48 2016 -0700
----------------------------------------------------------------------
.../strategy/internal/MultipartUploadSlicingAlgorithm.java | 6 ------
.../integration/internal/BaseBlobIntegrationTest.java | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d983d8d0/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java
index 32aac76..0da3bf6 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java
@@ -43,7 +43,6 @@ public final class MultipartUploadSlicingAlgorithm {
@VisibleForTesting
static final int DEFAULT_MAGNITUDE_BASE = 100;
- // TODO: these are not injected
@Inject(optional = true)
@Named("jclouds.mpu.parts.size")
@VisibleForTesting
@@ -109,11 +108,6 @@ public final class MultipartUploadSlicingAlgorithm {
unitPartSize = minimumPartSize; // take the minimum part size
parts = (int)(length / unitPartSize);
}
- if (parts == 0) {
- partSize = length;
- unitPartSize = length;
- parts = 1;
- }
if (parts > maximumNumberOfParts) { // if still splits in too many parts
parts = maximumNumberOfParts - 1; // limit them. do not care about not
// covering
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d983d8d0/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
----------------------------------------------------------------------
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
index 30edfe3..cb3477d 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
@@ -639,7 +639,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
blobStore.getMinimumMultipartPartSize(), blobStore.getMaximumMultipartPartSize(),
blobStore.getMaximumNumberOfParts());
// make sure that we are creating multiple parts
- assertThat(algorithm.calculateChunkSize(length)).isLessThanOrEqualTo(length);
+ assertThat(algorithm.calculateChunkSize(length)).isLessThan(length);
ByteSource byteSource = TestUtils.randomByteSource().slice(0, length);
Payload payload = new ByteSourcePayload(byteSource);
HashCode hashCode = byteSource.hash(Hashing.md5());