You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by el...@apache.org on 2012/07/08 20:29:18 UTC
svn commit: r1358811 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs:
CHANGES.txt src/main/native/hdfs.c src/main/native/hdfs.h
Author: eli
Date: Sun Jul 8 18:29:17 2012
New Revision: 1358811
URL: http://svn.apache.org/viewvc?rev=1358811&view=rev
Log:
HDFS-711. hdfsUtime does not handle atime = 0 or mtime = 0 correctly. Contributed by Colin Patrick McCabe
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.c
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.h
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1358811&r1=1358810&r2=1358811&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Sun Jul 8 18:29:17 2012
@@ -274,6 +274,9 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3603. Decouple TestHDFSTrash from TestTrash. (Jason Lowe via eli)
+ HDFS-711. hdfsUtime does not handle atime = 0 or mtime = 0 correctly.
+ (Colin Patrick McCabe via eli)
+
BREAKDOWN OF HDFS-3042 SUBTASKS
HDFS-2185. HDFS portion of ZK-based FailoverController (todd)
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.c
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.c?rev=1358811&r1=1358810&r2=1358811&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.c (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.c Sun Jul 8 18:29:17 2012
@@ -1710,8 +1710,9 @@ int hdfsUtime(hdfsFS fs, const char* pat
return -2;
}
- jlong jmtime = mtime * (jlong)1000;
- jlong jatime = atime * (jlong)1000;
+ const tTime NO_CHANGE = -1;
+ jlong jmtime = (mtime == NO_CHANGE) ? -1 : (mtime * (jlong)1000);
+ jlong jatime = (atime == NO_CHANGE) ? -1 : (atime * (jlong)1000);
int ret = 0;
jthrowable jExc = NULL;
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.h
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.h?rev=1358811&r1=1358810&r2=1358811&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.h (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.h Sun Jul 8 18:29:17 2012
@@ -468,8 +468,8 @@ extern "C" {
* hdfsUtime
* @param fs The configured filesystem handle.
* @param path the path to the file or directory
- * @param mtime new modification time or 0 for only set access time in seconds
- * @param atime new access time or 0 for only set modification time in seconds
+ * @param mtime new modification time or -1 for no change
+ * @param atime new access time or -1 for no change
* @return 0 on success else -1
*/
int hdfsUtime(hdfsFS fs, const char* path, tTime mtime, tTime atime);