1
0
Selaa lähdekoodia

HADOOP-1902. "dfs du" command without any arguments operates on the
current working directory. (Mahadev Konar via dhruba)



git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@629891 13f79535-47bb-0310-9956-ffa450edef68

Dhruba Borthakur 17 vuotta sitten
vanhempi
commit
e4573fd0e3

+ 3 - 0
CHANGES.txt

@@ -13,6 +13,9 @@ Trunk (unreleased changes)
     HADOOP-2192. Error messages from "dfs mv" command improved.
     (Mahadev Konar via dhruba)
 
+    HADOOP-1902. "dfs du" command without any arguments operates on the
+    current working directory.  (Mahadev Konar via dhruba)
+
   NEW FEATURES
 
     HADOOP-1398.  Add HBase in-memory block cache.  (tomwhite)

+ 2 - 2
src/java/org/apache/hadoop/fs/FsShell.java

@@ -1710,13 +1710,13 @@ public class FsShell extends Configured implements Tool {
         if (i < argv.length) {
           exitCode = doall(cmd, argv, getConf(), i);
         } else {
-          du("");
+          du(".");
         }
       } else if ("-dus".equals(cmd)) {
         if (i < argv.length) {
           exitCode = doall(cmd, argv, getConf(), i);
         } else {
-          dus("");
+          dus(".");
         }         
       } else if ("-mkdir".equals(cmd)) {
         exitCode = doall(cmd, argv, getConf(), i);

+ 10 - 0
src/test/org/apache/hadoop/dfs/TestDFSShell.java

@@ -292,6 +292,16 @@ public class TestDFSShell extends TestCase {
       returned = out.toString();
       assertTrue(" unix like output",
           (returned.lastIndexOf("No such file or") != -1));
+      out.reset();
+      argv = new String[1];
+      argv[0] = "-du";
+      srcFs.mkdirs(new Path("/user/"+ 
+          System.getProperty("user.name")));
+      ret = ToolRunner.run(shell, argv);
+      returned = out.toString();
+      assertTrue(" no error ", (ret == 0));
+      assertTrue("empty path specified",
+          (returned.lastIndexOf("empty string") == -1));
     } finally {
       if (bak != null) {
         System.setErr(bak);