Repository: hadoop Updated Branches: refs/heads/branch-2 3c4c52a09 -> 95b8f1f3a
HADOOP-12446. Undeprecate createNonRecursive(). Contributed by Ted Yu. (cherry picked from commit 3abbdc929bde05f8819f5410cef1eaeb8940203f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/95b8f1f3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/95b8f1f3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/95b8f1f3 Branch: refs/heads/branch-2 Commit: 95b8f1f3a68df48a427b50311359802a2d31e20f Parents: 3c4c52a Author: Kihwal Lee <[email protected]> Authored: Mon Sep 28 17:33:20 2015 -0500 Committer: Kihwal Lee <[email protected]> Committed: Mon Sep 28 17:33:20 2015 -0500 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../src/main/java/org/apache/hadoop/fs/FileSystem.java | 6 ------ .../src/main/java/org/apache/hadoop/fs/FilterFileSystem.java | 1 - .../src/main/java/org/apache/hadoop/fs/HarFileSystem.java | 1 - .../src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java | 1 - .../java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java | 1 - .../src/test/java/org/apache/hadoop/fs/TestHarFileSystem.java | 1 - .../java/org/apache/hadoop/hdfs/DistributedFileSystem.java | 1 - .../java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java | 1 - .../src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java | 1 - .../java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java | 3 --- .../apache/hadoop/fs/azure/NativeAzureFileSystemBaseTest.java | 1 - 12 files changed, 2 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/95b8f1f3/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f121b05..51a23b8 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -279,6 +279,8 @@ Release 2.8.0 - UNRELEASED HADOOP-12428. Fix inconsistency between log-level guards and statements. (Jagadesh Kiran N and Jackie Chang via ozawa) + HADOOP-12446. Undeprecate createNonRecursive() (Ted Yu via kihwal) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp http://git-wip-us.apache.org/repos/asf/hadoop/blob/95b8f1f3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java index e07f81c..b167cdf 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java @@ -1089,9 +1089,7 @@ public abstract class FileSystem extends Configured implements Closeable { * @param progress * @throws IOException * @see #setPermission(Path, FsPermission) - * @deprecated API only for 0.20-append */ - @Deprecated public FSDataOutputStream createNonRecursive(Path f, boolean overwrite, int bufferSize, short replication, long blockSize, @@ -1114,9 +1112,7 @@ public abstract class FileSystem extends Configured implements Closeable { * @param progress * @throws IOException * @see #setPermission(Path, FsPermission) - * @deprecated API only for 0.20-append */ - @Deprecated public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, boolean overwrite, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { @@ -1139,9 +1135,7 @@ public abstract class FileSystem extends Configured implements Closeable { * @param progress * @throws IOException * @see #setPermission(Path, FsPermission) - * @deprecated API only for 0.20-append */ - @Deprecated public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, EnumSet<CreateFlag> flags, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { http://git-wip-us.apache.org/repos/asf/hadoop/blob/95b8f1f3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java index 815ef69..f862c74 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java @@ -203,7 +203,6 @@ public class FilterFileSystem extends FileSystem { @Override - @Deprecated public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, EnumSet<CreateFlag> flags, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { http://git-wip-us.apache.org/repos/asf/hadoop/blob/95b8f1f3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java index e89bc49..c8323fe 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java @@ -713,7 +713,6 @@ public class HarFileSystem extends FileSystem { throw new IOException("Har: create not allowed."); } - @SuppressWarnings("deprecation") @Override public FSDataOutputStream createNonRecursive(Path f, boolean overwrite, int bufferSize, short replication, long blockSize, Progressable progress) http://git-wip-us.apache.org/repos/asf/hadoop/blob/95b8f1f3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java index a1e31b9..a6a9665 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java @@ -312,7 +312,6 @@ public class RawLocalFileSystem extends FileSystem { } @Override - @Deprecated public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, EnumSet<CreateFlag> flags, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { http://git-wip-us.apache.org/repos/asf/hadoop/blob/95b8f1f3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java index f7a93e7..dd28c58 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java @@ -185,7 +185,6 @@ class ChRootedFileSystem extends FilterFileSystem { } @Override - @Deprecated public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, EnumSet<CreateFlag> flags, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { http://git-wip-us.apache.org/repos/asf/hadoop/blob/95b8f1f3/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystem.java index 1710ba4..b179c36 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystem.java @@ -55,7 +55,6 @@ public class TestHarFileSystem { * {@link HarFileSystem}. Either because there is a default implementation * already available or because it is not relevant. */ - @SuppressWarnings("deprecation") private interface MustNotImplement { public BlockLocation[] getFileBlockLocations(Path p, long start, long len); public long getLength(Path f); http://git-wip-us.apache.org/repos/asf/hadoop/blob/95b8f1f3/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java index 182fc01..4bb1359 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java @@ -484,7 +484,6 @@ public class DistributedFileSystem extends FileSystem { * Same as create(), except fails if parent directory doesn't already exist. */ @Override - @SuppressWarnings("deprecation") public FSDataOutputStream createNonRecursive(final Path f, final FsPermission permission, final EnumSet<CreateFlag> flag, final int bufferSize, final short replication, final long blockSize, http://git-wip-us.apache.org/repos/asf/hadoop/blob/95b8f1f3/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java index d4912be..6a2818f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java @@ -1188,7 +1188,6 @@ public class WebHdfsFileSystem extends FileSystem } @Override - @SuppressWarnings("deprecation") public FSDataOutputStream createNonRecursive(final Path f, final FsPermission permission, final EnumSet<CreateFlag> flag, final int bufferSize, final short replication, final long blockSize, http://git-wip-us.apache.org/repos/asf/hadoop/blob/95b8f1f3/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java index e59963b..4ad066f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java @@ -860,7 +860,6 @@ public class TestFileCreation { // Attempts to create and close a file using FileSystem.createNonRecursive(), // catching and returning an exception if one occurs or null // if the operation is successful. - @SuppressWarnings("deprecation") static IOException createNonRecursive(FileSystem fs, Path name, int repl, EnumSet<CreateFlag> flag) throws IOException { try { http://git-wip-us.apache.org/repos/asf/hadoop/blob/95b8f1f3/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java index bb9941b..910582e 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java @@ -1204,7 +1204,6 @@ public class NativeAzureFileSystem extends FileSystem { } @Override - @SuppressWarnings("deprecation") public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, boolean overwrite, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { @@ -1279,7 +1278,6 @@ public class NativeAzureFileSystem extends FileSystem { } @Override - @SuppressWarnings("deprecation") public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, EnumSet<CreateFlag> flags, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { @@ -1298,7 +1296,6 @@ public class NativeAzureFileSystem extends FileSystem { } @Override - @SuppressWarnings("deprecation") public FSDataOutputStream createNonRecursive(Path f, boolean overwrite, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { http://git-wip-us.apache.org/repos/asf/hadoop/blob/95b8f1f3/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/NativeAzureFileSystemBaseTest.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/NativeAzureFileSystemBaseTest.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/NativeAzureFileSystemBaseTest.java index 6989a70..1f07677 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/NativeAzureFileSystemBaseTest.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/NativeAzureFileSystemBaseTest.java @@ -1332,7 +1332,6 @@ public abstract class NativeAzureFileSystemBaseTest { return (lastModified > (time - errorMargin) && lastModified < (time + errorMargin)); } - @SuppressWarnings("deprecation") @Test public void testCreateNonRecursive() throws Exception { Path testFolder = new Path("/testFolder");
