Repository: hadoop Updated Branches: refs/heads/trunk 464ff479c -> cc45da79f
HADOOP-13233. help of stat is confusing. Contributed by Attila Bukor. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cc45da79 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cc45da79 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cc45da79 Branch: refs/heads/trunk Commit: cc45da79fda7dfba2795ac397d62f40a858dcdd9 Parents: 464ff47 Author: Wei-Chiu Chuang <weic...@apache.org> Authored: Mon Feb 13 10:14:45 2017 -0800 Committer: Wei-Chiu Chuang <weic...@apache.org> Committed: Mon Feb 13 10:14:45 2017 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/shell/Stat.java | 4 ++-- .../hadoop-common/src/site/markdown/FileSystemShell.md | 2 +- .../hadoop-common/src/test/resources/testConf.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cc45da79/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Stat.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Stat.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Stat.java index 42f7843..cf8270e 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Stat.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Stat.java @@ -33,7 +33,7 @@ import org.apache.hadoop.fs.FileStatus; * Format sequences:<br> * %a: Permissions in octal<br> * %A: Permissions in symbolic style<br> - * %b: Size of file in blocks<br> + * %b: Size of file in bytes<br> * %F: Type<br> * %g: Group name of owner<br> * %n: Filename<br> @@ -60,7 +60,7 @@ class Stat extends FsCommand { "Print statistics about the file/directory at <path>" + NEWLINE + "in the specified format. Format accepts permissions in" + NEWLINE + "octal (%a) and symbolic (%A), filesize in" + NEWLINE + - "blocks (%b), type (%F), group name of owner (%g)," + NEWLINE + + "bytes (%b), type (%F), group name of owner (%g)," + NEWLINE + "name (%n), block size (%o), replication (%r), user name" + NEWLINE + "of owner (%u), modification date (%y, %Y)." + NEWLINE + "%y shows UTC date as \"yyyy-MM-dd HH:mm:ss\" and" + NEWLINE + http://git-wip-us.apache.org/repos/asf/hadoop/blob/cc45da79/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md ---------------------------------------------------------------------- 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 43fc28b..42fddc9 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md @@ -667,7 +667,7 @@ stat Usage: `hadoop fs -stat [format] <path> ...` -Print statistics about the file/directory at \<path\> in the specified format. Format accepts permissions in octal (%a) and symbolic (%A), filesize in blocks (%b), type (%F), group name of owner (%g), name (%n), block size (%o), replication (%r), user name of owner(%u), and modification date (%y, %Y). %y shows UTC date as "yyyy-MM-dd HH:mm:ss" and %Y shows milliseconds since January 1, 1970 UTC. If the format is not specified, %y is used by default. +Print statistics about the file/directory at \<path\> in the specified format. Format accepts permissions in octal (%a) and symbolic (%A), filesize in bytes (%b), type (%F), group name of owner (%g), name (%n), block size (%o), replication (%r), user name of owner(%u), and modification date (%y, %Y). %y shows UTC date as "yyyy-MM-dd HH:mm:ss" and %Y shows milliseconds since January 1, 1970 UTC. If the format is not specified, %y is used by default. Example: http://git-wip-us.apache.org/repos/asf/hadoop/blob/cc45da79/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml ---------------------------------------------------------------------- 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 d285f33..112aea0 100644 --- a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml +++ b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml @@ -867,7 +867,7 @@ </comparator> <comparator> <type>RegexpComparator</type> - <expected-output>^( |\t)*blocks \(%b\), type \(%F\), group name of owner \(%g\),( )*</expected-output> + <expected-output>^( |\t)*bytes \(%b\), type \(%F\), group name of owner \(%g\),( )*</expected-output> </comparator> <comparator> <type>RegexpComparator</type> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org