Author: kihwal Date: Mon Mar 3 16:41:46 2014 New Revision: 1573605 URL: http://svn.apache.org/r1573605 Log: svn merge -c 1573604 merging from trunk to branch-2 to fix:HADOOP-10314. The ls command help still shows outdated 0.16 format. Contributed by Rushabh S Shah.
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1573605&r1=1573604&r2=1573605&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Mon Mar 3 16:41:46 2014 @@ -49,6 +49,9 @@ Release 2.4.0 - UNRELEASED HADOOP-10285. Admin interface to swap callqueue at runtime. (Chris Li via Arpit Agarwal) + HADOOP-10314. The ls command help still shows outdated 0.16 format. + (Rushabh S Shah via kihwal) + OPTIMIZATIONS BUG FIXES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java?rev=1573605&r1=1573604&r2=1573605&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java Mon Mar 3 16:41:46 2014 @@ -51,18 +51,18 @@ class Ls extends FsCommand { public static final String NAME = "ls"; public static final String USAGE = "[-d] [-h] [-R] [<path> ...]"; public static final String DESCRIPTION = - "List the contents that match the specified file pattern. If\n" + - "path is not specified, the contents of /user/<currentUser>\n" + - "will be listed. Directory entries are of the form \n" + - "\tdirName (full path) <dir> \n" + - "and file entries are of the form \n" + - "\tfileName(full path) <r n> size \n" + - "where n is the number of replicas specified for the file \n" + - "and size is the size of the file, in bytes.\n" + - " -d Directories are listed as plain files.\n" + - " -h Formats the sizes of files in a human-readable fashion\n" + - " rather than a number of bytes.\n" + - " -R Recursively list the contents of directories."; + "List the contents that match the specified file pattern. If\n" + + "path is not specified, the contents of /user/<currentUser>\n" + + "will be listed. Directory entries are of the form \n" + + "\tpermissions - userid groupid size_of_directory(in bytes) modification_date(yyyy-MM-dd HH:mm) directoryName \n" + + "and file entries are of the form \n" + + "\tpermissions number_of_replicas userid groupid size_of_file(in bytes) modification_date(yyyy-MM-dd HH:mm) fileName \n" + + " -d Directories are listed as plain files.\n" + + " -h Formats the sizes of files in a human-readable fashion\n" + + " rather than a number of bytes.\n" + + " -R Recursively list the contents of directories."; + + protected static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml?rev=1573605&r1=1573604&r2=1573605&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml Mon Mar 3 16:41:46 2014 @@ -70,23 +70,15 @@ </comparator> <comparator> <type>RegexpComparator</type> - <expected-output>^( |\t)*dirName \(full path\) <dir>( )*</expected-output> + <expected-output>^( |\t)*permissions - userid groupid size_of_directory\(in bytes\) modification_date\(yyyy-MM-dd HH:mm\) directoryName( )*</expected-output> </comparator> - <comparator> + <comparator> <type>RegexpComparator</type> <expected-output>^( |\t)*and file entries are of the form( )*</expected-output> </comparator> - <comparator> - <type>RegexpComparator</type> - <expected-output>^( |\t)*fileName\(full path\) <r n> size( )*</expected-output> - </comparator> - <comparator> - <type>RegexpComparator</type> - <expected-output>^( |\t)*where n is the number of replicas specified for the file( )*</expected-output> - </comparator> - <comparator> + <comparator> <type>RegexpComparator</type> - <expected-output>^( |\t)*and size is the size of the file, in bytes.( )*</expected-output> + <expected-output>^( |\t)*permissions number_of_replicas userid groupid size_of_file\(in bytes\) modification_date\(yyyy-MM-dd HH:mm\) fileName( )*</expected-output> </comparator> <comparator> <type>RegexpComparator</type>