From 3abbdc929bde05f8819f5410cef1eaeb8940203f Mon Sep 17 00:00:00 2001 From: Kihwal Lee Date: Mon, 28 Sep 2015 17:31:51 -0500 Subject: [PATCH] HADOOP-12446. Undeprecate createNonRecursive(). Contributed by Ted Yu. --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../src/main/java/org/apache/hadoop/fs/FileSystem.java | 6 ------ .../main/java/org/apache/hadoop/fs/FilterFileSystem.java | 1 - .../src/main/java/org/apache/hadoop/fs/HarFileSystem.java | 1 - .../main/java/org/apache/hadoop/fs/RawLocalFileSystem.java | 1 - .../org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java | 1 - .../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 - .../test/java/org/apache/hadoop/hdfs/TestFileCreation.java | 1 - .../org/apache/hadoop/fs/azure/NativeAzureFileSystem.java | 3 --- .../hadoop/fs/azure/NativeAzureFileSystemBaseTest.java | 1 - 12 files changed, 2 insertions(+), 18 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c7c5de2715..07463f438b 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -787,6 +787,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 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 2bcaa5492a..6f13a87650 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 @@ protected void primitiveMkdir(Path f, FsPermission absolutePermission, * @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 FSDataOutputStream createNonRecursive(Path f, * @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 FSDataOutputStream createNonRecursive(Path f, FsPermission permission, * @param progress * @throws IOException * @see #setPermission(Path, FsPermission) - * @deprecated API only for 0.20-append */ - @Deprecated public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, EnumSet flags, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { 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 815ef6974d..f862c741a2 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 @@ protected RemoteIterator listLocatedStatus(final Path f, @Override - @Deprecated public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, EnumSet flags, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { 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 714702b2d5..868b8dcd56 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 FSDataOutputStream create(Path f, FsPermission permission, 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) 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 8ff65fad77..352b27aa3a 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 @@ -319,7 +319,6 @@ protected OutputStream createOutputStreamWithMode(Path f, boolean append, } @Override - @Deprecated public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, EnumSet flags, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { 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 f7a93e7818..dd28c58197 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 @@ public FSDataOutputStream create(final Path f, final FsPermission permission, } @Override - @Deprecated public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, EnumSet flags, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { 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 1710ba4a4b..b179c36b57 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); 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 88e6637bb0..ea86d2dc77 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 @@ -446,7 +446,6 @@ protected HdfsDataOutputStream primitiveCreate(Path f, * 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 flag, final int bufferSize, final short replication, final long blockSize, 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 cfda3fe749..e245d2ace4 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 @@ -1179,7 +1179,6 @@ public FSDataOutputStream create(final Path f, final FsPermission permission, } @Override - @SuppressWarnings("deprecation") public FSDataOutputStream createNonRecursive(final Path f, final FsPermission permission, final EnumSet flag, final int bufferSize, final short replication, final long blockSize, 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 e59963b867..4ad066fa49 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 static void testFileCreationNonRecursive(FileSystem fs) throws IOExceptio // 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 flag) throws IOException { try { 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 bb9941bf6e..910582e4fc 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 SelfRenewingLease acquireLease(Path path) throws AzureException { } @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 FSDataOutputStream createNonRecursive(Path f, FsPermission permission, } @Override - @SuppressWarnings("deprecation") public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, EnumSet flags, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { @@ -1298,7 +1296,6 @@ public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, } @Override - @SuppressWarnings("deprecation") public FSDataOutputStream createNonRecursive(Path f, boolean overwrite, int bufferSize, short replication, long blockSize, Progressable progress) throws IOException { 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 6989a700f7..1f07677fc2 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 @@ private boolean testModifiedTime(Path testPath, long time) throws Exception { return (lastModified > (time - errorMargin) && lastModified < (time + errorMargin)); } - @SuppressWarnings("deprecation") @Test public void testCreateNonRecursive() throws Exception { Path testFolder = new Path("/testFolder");