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 2015/06/08 23:29:29 UTC
[1/2] jclouds git commit: metadata and content metadata should have
the same length
Repository: jclouds
Updated Branches:
refs/heads/master 4f6af1332 -> 454a30a48
metadata and content metadata should have the same length
for range get in a LocalBlobStore, metadata.getSize() has the
original blob size and contentMetadata.getContentLength() has
the actual payload size. Other blobstores have the same size
in both
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/573ceb51
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/573ceb51
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/573ceb51
Branch: refs/heads/master
Commit: 573ceb51c36b78bd1c84ed095567c67975c275cf
Parents: 4f6af13
Author: Ka-Hing Cheung <kh...@hxbc.us>
Authored: Thu May 28 15:39:36 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Jun 8 14:28:16 2015 -0700
----------------------------------------------------------------------
.../java/org/jclouds/blobstore/TransientStorageStrategy.java | 1 +
.../main/java/org/jclouds/blobstore/config/LocalBlobStore.java | 4 +++-
.../integration/internal/BaseBlobStoreIntegrationTest.java | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/573ceb51/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java b/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java
index dc8c276..a15d3a8 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java
@@ -230,6 +230,7 @@ public class TransientStorageStrategy implements LocalStorageStrategy {
MutableContentMetadata oldMd = in.getPayload().getContentMetadata();
HttpUtils.copy(oldMd, payload.getContentMetadata());
payload.getContentMetadata().setContentMD5(contentMd5);
+ payload.getContentMetadata().setContentLength((long) input.length);
Blob blob = blobFactory.create(BlobStoreUtils.copy(in.getMetadata()));
blob.setPayload(payload);
blob.getMetadata().setContainer(containerName);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/573ceb51/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
index 36be5a0..be96b73 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
@@ -658,7 +658,9 @@ public final class LocalBlobStore implements BlobStore {
byte[] byteArray = out.toByteArray();
blob.setPayload(byteArray);
HttpUtils.copy(cmd, blob.getPayload().getContentMetadata());
- blob.getPayload().getContentMetadata().setContentLength(Long.valueOf(byteArray.length));
+ Long size = Long.valueOf(byteArray.length);
+ blob.getPayload().getContentMetadata().setContentLength(size);
+ blob.getMetadata().setSize(size);
}
}
checkNotNull(blob.getPayload(), "payload " + blob);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/573ceb51/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
----------------------------------------------------------------------
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
index 89776d6..917fb75 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
@@ -284,6 +284,7 @@ public class BaseBlobStoreIntegrationTest extends BaseViewLiveTest<BlobStoreCont
protected <T extends BlobMetadata> T validateMetadata(T md, String container, String name) {
assertEquals(md.getName(), name);
assertEquals(md.getContainer(), container);
+ assertEquals(md.getSize(), md.getContentMetadata().getContentLength());
return md;
}
[2/2] jclouds git commit: Set Atmos object size to content metadata
size
Posted by ga...@apache.org.
Set Atmos object size to content metadata size
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/454a30a4
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/454a30a4
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/454a30a4
Branch: refs/heads/master
Commit: 454a30a4846785dbfa214dc2c1250c86225dc3b5
Parents: 573ceb5
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon Jun 8 14:27:22 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Jun 8 14:28:42 2015 -0700
----------------------------------------------------------------------
.../org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/454a30a4/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java
----------------------------------------------------------------------
diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java
index 6833ed0..17aaee9 100644
--- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java
+++ b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java
@@ -77,6 +77,7 @@ public class ObjectToBlobMetadata implements Function<AtmosObject, MutableBlobMe
lowerKeyMetadata.put(key, entry.getValue());
}
to.setUserMetadata(lowerKeyMetadata);
+ to.setSize(from.getContentMetadata().getContentLength());
return to;
}
}