Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11661. Deprecate FileUtil#copyMerge. Contributed by Brahma Reddy Battula. 

(cherry picked from commit a8d8b80a20)
This commit is contained in:
Akira Ajisaka 2016-04-01 13:59:14 +09:00
parent ab9dc84d4a
commit 80d122d7fe
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
View File

@ -381,6 +381,7 @@ public class FileUtil {
} }
@Deprecated
/** Copy all files in a directory to one output file (merge). */ /** Copy all files in a directory to one output file (merge). */
public static boolean copyMerge(FileSystem srcFS, Path srcDir, public static boolean copyMerge(FileSystem srcFS, Path srcDir,
FileSystem dstFS, Path dstFile, FileSystem dstFS, Path dstFile,

1
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
View File

@ -559,6 +559,7 @@ public class TestFileUtil {
* @return boolean true if the call to FileUtil.copyMerge was successful. * @return boolean true if the call to FileUtil.copyMerge was successful.
* @throws IOException if an I/O error occurs. * @throws IOException if an I/O error occurs.
*/ */
@SuppressWarnings("deprecation")
private boolean copyMerge(String src, String dst) private boolean copyMerge(String src, String dst)
throws IOException { throws IOException {
Configuration conf = new Configuration(); Configuration conf = new Configuration();