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 he...@apache.org on 2021/03/14 10:10:31 UTC
[hadoop] branch trunk updated: HADOOP-17585. Correct timestamp
format in the docs for the touch command. Contributed by Stephen O'Donnell.
This is an automated email from the ASF dual-hosted git repository.
hexiaoqiao pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new b1dc6c4 HADOOP-17585. Correct timestamp format in the docs for the touch command. Contributed by Stephen O'Donnell.
b1dc6c4 is described below
commit b1dc6c40a0695fedd8269a2a30a74da43e1d0ae7
Author: He Xiaoqiao <he...@apache.org>
AuthorDate: Sun Mar 14 18:09:50 2021 +0800
HADOOP-17585. Correct timestamp format in the docs for the touch command. Contributed by Stephen O'Donnell.
---
.../main/java/org/apache/hadoop/fs/shell/TouchCommands.java | 10 ++++++----
.../hadoop-common/src/site/markdown/FileSystemShell.md | 8 ++++----
.../hadoop-common/src/test/resources/testConf.xml | 6 +++---
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/TouchCommands.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/TouchCommands.java
index b81f2f7..872de30 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/TouchCommands.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/TouchCommands.java
@@ -102,8 +102,8 @@ public class TouchCommands extends FsCommand {
public static final String NAME = "touch";
public static final String USAGE = "[-" + OPTION_CHANGE_ONLY_ACCESS_TIME
+ "] [-" + OPTION_CHANGE_ONLY_MODIFICATION_TIME + "] [-"
- + OPTION_USE_TIMESTAMP + " TIMESTAMP ] [-" + OPTION_DO_NOT_CREATE_FILE
- + "] <path> ...";
+ + OPTION_USE_TIMESTAMP + " TIMESTAMP (yyyyMMdd:HHmmss) ] "
+ + "[-" + OPTION_DO_NOT_CREATE_FILE + "] <path> ...";
public static final String DESCRIPTION =
"Updates the access and modification times of the file specified by the"
+ " <path> to the current time. If the file does not exist, then a zero"
@@ -114,7 +114,8 @@ public class TouchCommands extends FsCommand {
+ OPTION_CHANGE_ONLY_MODIFICATION_TIME
+ " Change only the modification time \n" + "-"
+ OPTION_USE_TIMESTAMP + " TIMESTAMP"
- + " Use specified timestamp (in format yyyyMMddHHmmss) instead of current time \n"
+ + " Use specified timestamp instead of current time\n"
+ + " TIMESTAMP format yyyyMMdd:HHmmss\n"
+ "-" + OPTION_DO_NOT_CREATE_FILE + " Do not create any files";
private boolean changeModTime = false;
@@ -183,7 +184,8 @@ public class TouchCommands extends FsCommand {
time = dateFormat.parse(timestamp).getTime();
} catch (ParseException e) {
throw new IllegalArgumentException(
- "Unable to parse the specified timestamp " + timestamp, e);
+ "Unable to parse the specified timestamp "+ timestamp
+ + ". The expected format is " + dateFormat.toPattern(), e);
}
}
if (changeModTime ^ changeAccessTime) {
diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
index c5080db..c217cad 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
@@ -760,7 +760,7 @@ timestamp of that URI.
* Use -a option to change only the access time
* Use -m option to change only the modification time
-* Use -t option to specify timestamp (in format yyyyMMddHHmmss) instead of current time
+* Use -t option to specify timestamp (in format yyyyMMdd:HHmmss) instead of current time
* Use -c option to not create file if it does not exist
The timestamp format is as follows
@@ -770,13 +770,13 @@ The timestamp format is as follows
* HH Two digit hour of the day using 24 hour notation (e.g. 23 stands for 11 pm, 11 stands for 11 am)
* mm Two digit minutes of the hour
* ss Two digit seconds of the minute
-e.g. 20180809230000 represents August 9th 2018, 11pm
+e.g. 20180809:230000 represents August 9th 2018, 11pm
Example:
* `hadoop fs -touch pathname`
-* `hadoop fs -touch -m -t 20180809230000 pathname`
-* `hadoop fs -touch -t 20180809230000 pathname`
+* `hadoop fs -touch -m -t 20180809:230000 pathname`
+* `hadoop fs -touch -t 20180809:230000 pathname`
* `hadoop fs -touch -a pathname`
Exit Code: Returns 0 on success and -1 on error.
diff --git a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
index cbc50b9d..edf598b 100644
--- a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
+++ b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
@@ -819,7 +819,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^-touch \[-a\] \[-m\] \[-t TIMESTAMP \] \[-c\] <path> \.\.\. :( )*</expected-output>
+ <expected-output>^-touch \[-a\] \[-m\] \[-t TIMESTAMP \(yyyyMMdd\:HHmmss\) \] \[-c\] <path> \.\.\. :( )*</expected-output>
</comparator>
<comparator>
<type>RegexpComparator</type>
@@ -847,11 +847,11 @@
</comparator>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^\s*-t\s+TIMESTAMP\s+Use specified timestamp \(in format yyyyMMddHHmmss\) instead of</expected-output>
+ <expected-output>^\s*-t\s+TIMESTAMP\s+Use specified timestamp instead of current time( )*</expected-output>
</comparator>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^\s*current time( )*</expected-output>
+ <expected-output>^\s*TIMESTAMP format yyyyMMdd\:HHmmss</expected-output>
</comparator>
<comparator>
<type>RegexpComparator</type>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org