You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jclouds.apache.org by Andrew Gaul <no...@github.com> on 2014/02/20 07:11:34 UTC
[jclouds] Remove WriteTo (#301)
Guava helpers capture this functionality in a more idiomatic way.
You can merge this Pull Request by running:
git pull https://github.com/maginatics/jclouds remove-write-to
Or you can view, comment on it, or merge it online at:
https://github.com/jclouds/jclouds/pull/301
-- Commit Summary --
* Remove WriteTo
-- File Changes --
M apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftBlobIntegrationLiveTest.java (3)
M blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java (7)
M core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java (3)
M core/src/main/java/org/jclouds/io/Payload.java (2)
D core/src/main/java/org/jclouds/io/WriteTo.java (34)
M core/src/main/java/org/jclouds/io/payloads/BaseCipherPayload.java (7)
M core/src/main/java/org/jclouds/io/payloads/BasePayload.java (20)
M core/src/main/java/org/jclouds/io/payloads/DelegatingPayload.java (9)
M core/src/main/java/org/jclouds/io/payloads/PhantomPayload.java (8)
M core/src/test/java/org/jclouds/io/payloads/MultipartFormTest.java (7)
M drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java (7)
M drivers/gae/src/main/java/org/jclouds/gae/ConvertToGaeRequest.java (6)
-- Patch Links --
https://github.com/jclouds/jclouds/pull/301.patch
https://github.com/jclouds/jclouds/pull/301.diff
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/301
Re: [jclouds] Remove WriteTo (#301)
Posted by Andrew Gaul <no...@github.com>.
Pushed to master.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/301#issuecomment-35789978
Re: [jclouds] Remove WriteTo (#301)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #1085](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/1085/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/301#issuecomment-35595408
Re: [jclouds] Remove WriteTo (#301)
Posted by Andrew Gaul <no...@github.com>.
Closed #301.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/301
Re: [jclouds] Remove WriteTo (#301)
Posted by Andrew Phillips <no...@github.com>.
One small question, but overall +1 - looks good to me. Thanks, @andrewgaul!
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/301#issuecomment-35598894
Re: [jclouds] Remove WriteTo (#301)
Posted by Andrew Phillips <no...@github.com>.
> @@ -158,9 +158,8 @@ private Blob createUpdatedCopyOfBlobInContainer(String containerName, Blob in) {
> try {
> if (payload == null || !(payload instanceof ByteArrayPayload)) {
> MutableContentMetadata oldMd = in.getPayload().getContentMetadata();
> - ByteArrayOutputStream out = new ByteArrayOutputStream();
> - in.getPayload().writeTo(out);
> - payload = (ByteArrayPayload) Payloads.calculateMD5(Payloads.newPayload(out.toByteArray()));
> + byte[] out = ByteStreams.toByteArray(in.getPayload());
> + payload = (ByteArrayPayload) Payloads.calculateMD5(Payloads.newPayload(out));
OK, thanks for confirming!
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/301/files#r9970220
Re: [jclouds] Remove WriteTo (#301)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #614](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/614/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/301#issuecomment-35594694
Re: [jclouds] Remove WriteTo (#301)
Posted by Andrew Gaul <no...@github.com>.
> @@ -158,9 +158,8 @@ private Blob createUpdatedCopyOfBlobInContainer(String containerName, Blob in) {
> try {
> if (payload == null || !(payload instanceof ByteArrayPayload)) {
> MutableContentMetadata oldMd = in.getPayload().getContentMetadata();
> - ByteArrayOutputStream out = new ByteArrayOutputStream();
> - in.getPayload().writeTo(out);
> - payload = (ByteArrayPayload) Payloads.calculateMD5(Payloads.newPayload(out.toByteArray()));
> + byte[] out = ByteStreams.toByteArray(in.getPayload());
> + payload = (ByteArrayPayload) Payloads.calculateMD5(Payloads.newPayload(out));
This has the same memory consumption as before. A subsequent commit will leverage Guava 16 HashingInputStream to calculate the MD5 hash and store the byte array to disk for the filesystem blobstore and in-memory for transient while minimizing memory use.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/301/files#r9968606
Re: [jclouds] Remove WriteTo (#301)
Posted by Andrew Phillips <no...@github.com>.
> @@ -158,9 +158,8 @@ private Blob createUpdatedCopyOfBlobInContainer(String containerName, Blob in) {
> try {
> if (payload == null || !(payload instanceof ByteArrayPayload)) {
> MutableContentMetadata oldMd = in.getPayload().getContentMetadata();
> - ByteArrayOutputStream out = new ByteArrayOutputStream();
> - in.getPayload().writeTo(out);
> - payload = (ByteArrayPayload) Payloads.calculateMD5(Payloads.newPayload(out.toByteArray()));
> + byte[] out = ByteStreams.toByteArray(in.getPayload());
> + payload = (ByteArrayPayload) Payloads.calculateMD5(Payloads.newPayload(out));
If I understand correctly, there's no difference in terms of memory allocation here? I.e. we need a byte array in memory for the _whole_ payload in both cases...
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/301/files#r9899090