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 zj...@apache.org on 2015/07/27 22:07:51 UTC

[09/50] [abbrv] hadoop git commit: HADOOP-12184. Remove unused Linux-specific constants in NativeIO (Martin Walsh via Colin P. McCabe)

HADOOP-12184. Remove unused Linux-specific constants in NativeIO (Martin Walsh via Colin P. McCabe)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ddc71968
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ddc71968
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ddc71968

Branch: refs/heads/YARN-2928
Commit: ddc71968a17959db4711f83b2678a2867f3d2f3d
Parents: 807b222
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Wed Jul 22 11:11:38 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Mon Jul 27 12:57:31 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                  | 3 +++
 .../src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java    | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ddc71968/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 c0e5c92..ff7d2ad 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -713,6 +713,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12214. Parse 'HadoopArchive' commandline using cli Options.
     (vinayakumarb)
 
+    HADOOP-12184. Remove unused Linux-specific constants in NativeIO (Martin
+    Walsh via Colin P. McCabe)
+
   OPTIMIZATIONS
 
     HADOOP-11785. Reduce the number of listStatus operation in distcp

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ddc71968/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
index 688b955..77a40ea 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
@@ -67,9 +67,6 @@ public class NativeIO {
     public static final int O_APPEND   = 02000;
     public static final int O_NONBLOCK = 04000;
     public static final int O_SYNC   =  010000;
-    public static final int O_ASYNC  =  020000;
-    public static final int O_FSYNC = O_SYNC;
-    public static final int O_NDELAY = O_NONBLOCK;
 
     // Flags for posix_fadvise() from bits/fcntl.h
     /* No further special treatment.  */
@@ -356,7 +353,6 @@ public class NativeIO {
       public static final int   S_IFREG  = 0100000;  /* regular */
       public static final int   S_IFLNK  = 0120000;  /* symbolic link */
       public static final int   S_IFSOCK = 0140000;  /* socket */
-      public static final int   S_IFWHT  = 0160000;  /* whiteout */
       public static final int S_ISUID = 0004000;  /* set user id on execution */
       public static final int S_ISGID = 0002000;  /* set group id on execution */
       public static final int S_ISVTX = 0001000;  /* save swapped text even after use */