HADOOP-11661. Deprecate FileUtil#copyMerge. Contributed by Brahma Reddy Battula.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a8d8b80a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a8d8b80a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a8d8b80a Branch: refs/heads/HDFS-1312 Commit: a8d8b80a205c78bf0aa65d32a6a83c16d3ea3f0b Parents: aac4d65 Author: Akira Ajisaka <aajis...@apache.org> Authored: Fri Apr 1 13:59:14 2016 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Fri Apr 1 13:59:14 2016 +0900 ---------------------------------------------------------------------- .../hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java | 1 + .../src/test/java/org/apache/hadoop/fs/TestFileUtil.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a8d8b80a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java index e74c41c..b855c48 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java @@ -381,6 +381,7 @@ public class FileUtil { } + @Deprecated /** Copy all files in a directory to one output file (merge). */ public static boolean copyMerge(FileSystem srcFS, Path srcDir, FileSystem dstFS, Path dstFile, http://git-wip-us.apache.org/repos/asf/hadoop/blob/a8d8b80a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java index 5fc0b2d..f7464b7 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java @@ -559,6 +559,7 @@ public class TestFileUtil { * @return boolean true if the call to FileUtil.copyMerge was successful. * @throws IOException if an I/O error occurs. */ + @SuppressWarnings("deprecation") private boolean copyMerge(String src, String dst) throws IOException { Configuration conf = new Configuration();
