You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ey...@apache.org on 2019/03/05 18:33:55 UTC
[hadoop] branch trunk updated: HADOOP-16150. Added concat method to
ChecksumFS as unsupported operation. Contributed by Steve Loughran
This is an automated email from the ASF dual-hosted git repository.
eyang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3c5b713 HADOOP-16150. Added concat method to ChecksumFS as unsupported operation. Contributed by Steve Loughran
3c5b713 is described below
commit 3c5b7136e25d39a3c29cc2025dc8ae7b347f4db0
Author: Eric Yang <ey...@apache.org>
AuthorDate: Tue Mar 5 13:27:06 2019 -0500
HADOOP-16150. Added concat method to ChecksumFS as unsupported operation.
Contributed by Steve Loughran
(cherry picked from commit 8b517e7ad670aa8ee0b73ce5a572f36ce63eabee)
---
.../src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java | 6 ++++++
.../fs/contract/localfs/TestLocalFSContractMultipartUploader.java | 8 ++++++++
2 files changed, 14 insertions(+)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
index 59d95cf..99aa5d2 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
@@ -372,6 +372,12 @@ public abstract class ChecksumFileSystem extends FilterFileSystem {
+ "by ChecksumFileSystem");
}
+ @Override
+ public void concat(final Path f, final Path[] psrcs) throws IOException {
+ throw new UnsupportedOperationException("Concat is not supported "
+ + "by ChecksumFileSystem");
+ }
+
/**
* Calculated the length of the checksum file in bytes.
* @param size the length of the data file in bytes
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/localfs/TestLocalFSContractMultipartUploader.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/localfs/TestLocalFSContractMultipartUploader.java
index 6e27964d..f675ddf 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/localfs/TestLocalFSContractMultipartUploader.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/localfs/TestLocalFSContractMultipartUploader.java
@@ -17,6 +17,8 @@
*/
package org.apache.hadoop.fs.contract.localfs;
+import org.junit.Assume;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.contract.AbstractContractMultipartUploaderTest;
import org.apache.hadoop.fs.contract.AbstractFSContract;
@@ -28,6 +30,12 @@ public class TestLocalFSContractMultipartUploader
extends AbstractContractMultipartUploaderTest {
@Override
+ public void setup() throws Exception {
+ Assume.assumeTrue("Skipping until HDFS-13934", false);
+ super.setup();
+ }
+
+ @Override
protected AbstractFSContract createContract(Configuration conf) {
return new LocalFSContract(conf);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org