Repository: hadoop Updated Branches: refs/heads/HDFS-9806 d9dc444dc -> 82fb9ce8d
HADOOP-14120 needless S3AFileSystem.setOptionalPutRequestParameters in S3ABlockOutputStream putObject(). Contributed by Yuanbo Liu (cherry picked from commit 20878d052cebc715c2494a97362fdff08885a77f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a5a4867f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a5a4867f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a5a4867f Branch: refs/heads/HDFS-9806 Commit: a5a4867f3b193a137a6260d539da7e21f02ffab3 Parents: 59d6925 Author: Steve Loughran <ste...@apache.org> Authored: Thu Mar 23 12:54:54 2017 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Mar 23 12:54:54 2017 +0000 ---------------------------------------------------------------------- .../java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java | 5 ++--- .../src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5a4867f/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java index 1b0929b..3fbdcb0 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java @@ -378,9 +378,8 @@ class S3ABlockOutputStream extends OutputStream { int size = block.dataSize(); final S3ADataBlocks.BlockUploadData uploadData = block.startUpload(); final PutObjectRequest putObjectRequest = uploadData.hasFile() ? - writeOperationHelper.newPutRequest(uploadData.getFile()) - : writeOperationHelper.newPutRequest(uploadData.getUploadStream(), size); - fs.setOptionalPutRequestParameters(putObjectRequest); + writeOperationHelper.newPutRequest(uploadData.getFile()) : + writeOperationHelper.newPutRequest(uploadData.getUploadStream(), size); long transferQueueTime = now(); BlockUploadProgress callback = new BlockUploadProgress( http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5a4867f/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java index 6c89412..57fbb85 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java @@ -1870,7 +1870,7 @@ public class S3AFileSystem extends FileSystem { } } - protected void setOptionalPutRequestParameters(PutObjectRequest request) { + private void setOptionalPutRequestParameters(PutObjectRequest request) { switch (serverSideEncryptionAlgorithm) { case SSE_KMS: request.setSSEAwsKeyManagementParams(generateSSEAwsKeyParams()); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
