hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r1127731 - in /hadoop/common/branches/yahoo-merge: ./ src/contrib/ec2/ src/docs/ src/java/ src/java/org/apache/hadoop/fs/ src/java/org/apache/hadoop/fs/shell/ src/test/core/ src/test/core/org/apache/hadoop/cli/ src/test/core/org/apache/hado...
Date Wed, 25 May 2011 23:40:04 GMT
Author: szetszwo
Date: Wed May 25 23:40:03 2011
New Revision: 1127731

URL: http://svn.apache.org/viewvc?rev=1127731&view=rev
Log:
svn merge -c 1127591 from trunk for HADOOP-7320.

Added:
    hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
      - copied unchanged from r1127591, hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
    hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/CopyCommands.java
      - copied unchanged from r1127591, hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/CopyCommands.java
    hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/MoveCommands.java
      - copied unchanged from r1127591, hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/MoveCommands.java
Removed:
    hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Copy.java
Modified:
    hadoop/common/branches/yahoo-merge/   (props changed)
    hadoop/common/branches/yahoo-merge/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/yahoo-merge/src/contrib/ec2/   (props changed)
    hadoop/common/branches/yahoo-merge/src/docs/   (props changed)
    hadoop/common/branches/yahoo-merge/src/java/   (props changed)
    hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/FsShell.java
    hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/FsCommand.java
    hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Ls.java
    hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/PathData.java
    hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/PathExceptions.java
    hadoop/common/branches/yahoo-merge/src/test/core/   (props changed)
    hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/cli/testConf.xml
    hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/TestFsShellReturnCode.java

Propchange: hadoop/common/branches/yahoo-merge/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 23:40:03 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:1043117,1076296,1078148,1080396,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426
+/hadoop/common/trunk:1043117,1076296,1078148,1080396,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426,1127591
 /hadoop/core/branches/branch-0.19/core:713112

Modified: hadoop/common/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/CHANGES.txt?rev=1127731&r1=1127730&r2=1127731&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/common/branches/yahoo-merge/CHANGES.txt Wed May 25 23:40:03 2011
@@ -80,6 +80,9 @@ Trunk (unreleased changes)
     HADOOP-7286. Refactor the du/dus/df commands to conform to new FsCommand
     class. (Daryn Sharp via todd)
 
+    HADOOP-7320. Refactor the copy and move commands to conform to new
+    FsCommand class. (Daryn Sharp via todd)
+
   OPTIMIZATIONS
 
   BUG FIXES

Propchange: hadoop/common/branches/yahoo-merge/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 23:40:03 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:1043117,1076296,1078148,1080396,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1092832,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426
+/hadoop/common/trunk/CHANGES.txt:1043117,1076296,1078148,1080396,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1092832,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426,1127591
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
 /hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278

Propchange: hadoop/common/branches/yahoo-merge/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 23:40:03 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:1043117,1076296,1078148,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426
+/hadoop/common/trunk/src/contrib/ec2:1043117,1076296,1078148,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426,1127591
 /hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
 /hadoop/core/trunk/src/contrib/ec2:776175-784663

Propchange: hadoop/common/branches/yahoo-merge/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 23:40:03 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:1043117,1076296,1078148,1080396,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426
+/hadoop/common/trunk/src/docs:1043117,1076296,1078148,1080396,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426,1127591
 /hadoop/core/branches/branch-0.19/src/docs:713112

Propchange: hadoop/common/branches/yahoo-merge/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 23:40:03 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:1043117,1076296,1078148,1080396,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426
+/hadoop/common/trunk/src/java:1043117,1076296,1078148,1080396,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426,1127591
 /hadoop/core/branches/branch-0.19/core/src/java:713112
 /hadoop/core/trunk/src/core:776175-785643,785929-786278

Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/FsShell.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/FsShell.java?rev=1127731&r1=1127730&r2=1127731&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/FsShell.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/FsShell.java Wed May 25 23:40:03 2011
@@ -17,15 +17,8 @@
  */
 package org.apache.hadoop.fs;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -36,12 +29,9 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.fs.shell.Command;
 import org.apache.hadoop.fs.shell.CommandFactory;
-import org.apache.hadoop.fs.shell.CommandFormat;
 import org.apache.hadoop.fs.shell.FsCommand;
 import org.apache.hadoop.fs.shell.PathExceptions.PathNotFoundException;
-import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.ipc.RPC;
-import org.apache.hadoop.ipc.RemoteException;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
@@ -56,14 +46,6 @@ public class FsShell extends Configured 
   private Trash trash;
   protected CommandFactory commandFactory;
 
-  public static final SimpleDateFormat dateForm = 
-    new SimpleDateFormat("yyyy-MM-dd HH:mm");
-  static final int BORDER = 2;
-
-  static final String GET_SHORT_USAGE = "-get [-ignoreCrc] [-crc] <src> <localdst>";
-  static final String COPYTOLOCAL_SHORT_USAGE = GET_SHORT_USAGE.replace(
-      "-get", "-copyToLocal");
-
   /**
    */
   public FsShell() {
@@ -95,397 +77,6 @@ public class FsShell extends Configured 
     getConf().setQuietMode(true);
   }
 
-  
-  /**
-   * Copies from stdin to the indicated file.
-   */
-  private void copyFromStdin(Path dst, FileSystem dstFs) throws IOException {
-    if (dstFs.isDirectory(dst)) {
-      throw new IOException("When source is stdin, destination must be a file.");
-    }
-    if (dstFs.exists(dst)) {
-      throw new IOException("Target " + dst.toString() + " already exists.");
-    }
-    FSDataOutputStream out = dstFs.create(dst); 
-    try {
-      IOUtils.copyBytes(System.in, out, getConf(), false);
-    } 
-    finally {
-      out.close();
-    }
-  }
-
-  /** 
-   * Print from src to stdout.
-   */
-  private void printToStdout(InputStream in) throws IOException {
-    try {
-      IOUtils.copyBytes(in, System.out, getConf(), false);
-    } finally {
-      in.close();
-    }
-  }
-
-  
-  /**
-   * Add local files to the indicated FileSystem name. src is kept.
-   */
-  void copyFromLocal(Path[] srcs, String dstf) throws IOException {
-    Path dstPath = new Path(dstf);
-    FileSystem dstFs = dstPath.getFileSystem(getConf());
-    if (srcs.length == 1 && srcs[0].toString().equals("-"))
-      copyFromStdin(dstPath, dstFs);
-    else
-      dstFs.copyFromLocalFile(false, false, srcs, dstPath);
-  }
-  
-  /**
-   * Add local files to the indicated FileSystem name. src is removed.
-   */
-  void moveFromLocal(Path[] srcs, String dstf) throws IOException {
-    Path dstPath = new Path(dstf);
-    FileSystem dstFs = dstPath.getFileSystem(getConf());
-    dstFs.moveFromLocalFile(srcs, dstPath);
-  }
-
-  /**
-   * Add a local file to the indicated FileSystem name. src is removed.
-   */
-  void moveFromLocal(Path src, String dstf) throws IOException {
-    moveFromLocal((new Path[]{src}), dstf);
-  }
-
-  /**
-   * Obtain the indicated files that match the file pattern <i>srcf</i>
-   * and copy them to the local name. srcf is kept.
-   * When copying multiple files, the destination must be a directory. 
-   * Otherwise, IOException is thrown.
-   * @param argv : arguments
-   * @param pos : Ignore everything before argv[pos]  
-   * @throws Exception 
-   * @see org.apache.hadoop.fs.FileSystem.globStatus 
-   */
-  void copyToLocal(String[]argv, int pos) throws Exception {
-    CommandFormat cf = new CommandFormat("copyToLocal", 2,2,"crc","ignoreCrc");
-    
-    String srcstr = null;
-    String dststr = null;
-    try {
-      List<String> parameters = cf.parse(argv, pos);
-      srcstr = parameters.get(0);
-      dststr = parameters.get(1);
-    }
-    catch(IllegalArgumentException iae) {
-      System.err.println("Usage: java FsShell " + GET_SHORT_USAGE);
-      throw iae;
-    }
-    boolean copyCrc = cf.getOpt("crc");
-    final boolean verifyChecksum = !cf.getOpt("ignoreCrc");
-
-    if (dststr.equals("-")) {
-      if (copyCrc) {
-        System.err.println("-crc option is not valid when destination is stdout.");
-      }
-      
-      List<String> catArgv = new ArrayList<String>();
-      catArgv.add("-cat");
-      if (cf.getOpt("ignoreCrc")) catArgv.add("-ignoreCrc");
-      catArgv.add(srcstr);      
-      run(catArgv.toArray(new String[0]));
-    } else {
-      File dst = new File(dststr);      
-      Path srcpath = new Path(srcstr);
-      FileSystem srcFS = getSrcFileSystem(srcpath, verifyChecksum);
-      if (copyCrc && !(srcFS instanceof ChecksumFileSystem)) {
-        System.err.println("-crc option is not valid when source file system " +
-            "does not have crc files. Automatically turn the option off.");
-        copyCrc = false;
-      }
-      FileStatus[] srcs = srcFS.globStatus(srcpath);
-      if (null == srcs) {
-        throw new PathNotFoundException(srcstr);
-      }
-      boolean dstIsDir = dst.isDirectory(); 
-      if (srcs.length > 1 && !dstIsDir) {
-        throw new IOException("When copying multiple files, "
-                              + "destination should be a directory.");
-      }
-      for (FileStatus status : srcs) {
-        Path p = status.getPath();
-        File f = dstIsDir? new File(dst, p.getName()): dst;
-        copyToLocal(srcFS, status, f, copyCrc);
-      }
-    }
-  }
-
-  /**
-   * Return the {@link FileSystem} specified by src and the conf.
-   * It the {@link FileSystem} supports checksum, set verifyChecksum.
-   */
-  private FileSystem getSrcFileSystem(Path src, boolean verifyChecksum
-      ) throws IOException { 
-    FileSystem srcFs = src.getFileSystem(getConf());
-    srcFs.setVerifyChecksum(verifyChecksum);
-    return srcFs;
-  }
-
-  /**
-   * The prefix for the tmp file used in copyToLocal.
-   * It must be at least three characters long, required by
-   * {@link java.io.File#createTempFile(String, String, File)}.
-   */
-  static final String COPYTOLOCAL_PREFIX = "_copyToLocal_";
-
-  /**
-   * Copy a source file from a given file system to local destination.
-   * @param srcFS source file system
-   * @param src source path
-   * @param dst destination
-   * @param copyCrc copy CRC files?
-   * @exception IOException If some IO failed
-   */
-  private void copyToLocal(final FileSystem srcFS, final FileStatus srcStatus,
-                           final File dst, final boolean copyCrc)
-    throws IOException {
-    /* Keep the structure similar to ChecksumFileSystem.copyToLocal(). 
-     * Ideal these two should just invoke FileUtil.copy() and not repeat
-     * recursion here. Of course, copy() should support two more options :
-     * copyCrc and useTmpFile (may be useTmpFile need not be an option).
-     */
-    
-    Path src = srcStatus.getPath();
-    if (srcStatus.isFile()) {
-      if (dst.exists()) {
-        // match the error message in FileUtil.checkDest():
-        throw new IOException("Target " + dst + " already exists");
-      }
-      
-      // use absolute name so that tmp file is always created under dest dir
-      File tmp = FileUtil.createLocalTempFile(dst.getAbsoluteFile(),
-                                              COPYTOLOCAL_PREFIX, true);
-      if (!FileUtil.copy(srcFS, src, tmp, false, srcFS.getConf())) {
-        throw new IOException("Failed to copy " + src + " to " + dst); 
-      }
-      
-      if (!tmp.renameTo(dst)) {
-        throw new IOException("Failed to rename tmp file " + tmp + 
-                              " to local destination \"" + dst + "\".");
-      }
-
-      if (copyCrc) {
-        if (!(srcFS instanceof ChecksumFileSystem)) {
-          throw new IOException("Source file system does not have crc files");
-        }
-        
-        ChecksumFileSystem csfs = (ChecksumFileSystem) srcFS;
-        File dstcs = FileSystem.getLocal(srcFS.getConf())
-          .pathToFile(csfs.getChecksumFile(new Path(dst.getCanonicalPath())));
-        FileSystem fs = csfs.getRawFileSystem();
-        FileStatus status = csfs.getFileStatus(csfs.getChecksumFile(src));
-        copyToLocal(fs, status, dstcs, false);
-      } 
-    } else if (srcStatus.isSymlink()) {
-      throw new AssertionError("Symlinks unsupported");
-    } else {
-      // once FileUtil.copy() supports tmp file, we don't need to mkdirs().
-      if (!dst.mkdirs()) {
-        throw new IOException("Failed to create local destination \"" +
-                              dst + "\".");
-      }
-      for(FileStatus status : srcFS.listStatus(src)) {
-        copyToLocal(srcFS, status,
-                    new File(dst, status.getPath().getName()), copyCrc);
-      }
-    }
-  }
-
-  /**
-   * Obtain the indicated file and copy to the local name.
-   * srcf is removed.
-   */
-  void moveToLocal(String srcf, Path dst) throws IOException {
-    System.err.println("Option '-moveToLocal' is not implemented yet.");
-  }
-    
-  /**
-   * Move files that match the file pattern <i>srcf</i>
-   * to a destination file.
-   * When moving mutiple files, the destination must be a directory. 
-   * Otherwise, IOException is thrown.
-   * @param srcf a file pattern specifying source files
-   * @param dstf a destination local file/directory 
-   * @throws IOException  
-   * @see org.apache.hadoop.fs.FileSystem#globStatus(Path)
-   */
-  void rename(String srcf, String dstf) throws IOException {
-    Path srcPath = new Path(srcf);
-    Path dstPath = new Path(dstf);
-    FileSystem fs = srcPath.getFileSystem(getConf());
-    URI srcURI = fs.getUri();
-    URI dstURI = dstPath.getFileSystem(getConf()).getUri();
-    if (srcURI.compareTo(dstURI) != 0) {
-      throw new IOException("src and destination filesystems do not match.");
-    }
-    Path[] srcs = FileUtil.stat2Paths(fs.globStatus(srcPath), srcPath);
-    Path dst = new Path(dstf);
-    if (srcs.length > 1 && !fs.isDirectory(dst)) {
-      throw new IOException("When moving multiple files, " 
-                            + "destination should be a directory.");
-    }
-    for(int i=0; i<srcs.length; i++) {
-      if (!fs.rename(srcs[i], dst)) {
-        FileStatus srcFstatus = null;
-        FileStatus dstFstatus = null;
-        try {
-          srcFstatus = fs.getFileStatus(srcs[i]);
-        } catch(FileNotFoundException e) {
-          throw new PathNotFoundException(srcs[i].toString());
-        }
-        try {
-          dstFstatus = fs.getFileStatus(dst);
-        } catch(IOException e) {
-          LOG.debug("Error getting file status of " + dst, e);
-        }
-        if((srcFstatus!= null) && (dstFstatus!= null)) {
-          if (srcFstatus.isDirectory()  && !dstFstatus.isDirectory()) {
-            throw new IOException("cannot overwrite non directory "
-                + dst + " with directory " + srcs[i]);
-          }
-        }
-        throw new IOException("Failed to rename " + srcs[i] + " to " + dst);
-      }
-    }
-  }
-
-  /**
-   * Move/rename file(s) to a destination file. Multiple source
-   * files can be specified. The destination is the last element of
-   * the argvp[] array.
-   * If multiple source files are specified, then the destination 
-   * must be a directory. Otherwise, IOException is thrown.
-   * @throws IOException on error
-   */
-  private int rename(String argv[], Configuration conf) throws IOException {
-    int i = 0;
-    int exitCode = 0;
-    String cmd = argv[i++];  
-    String dest = argv[argv.length-1];
-    //
-    // If the user has specified multiple source files, then
-    // the destination has to be a directory
-    //
-    if (argv.length > 3) {
-      Path dst = new Path(dest);
-      FileSystem dstFs = dst.getFileSystem(getConf());
-      if (!dstFs.isDirectory(dst)) {
-        throw new IOException("When moving multiple files, " 
-                              + "destination " + dest + " should be a directory.");
-      }
-    }
-    //
-    // for each source file, issue the rename
-    //
-    for (; i < argv.length - 1; i++) {
-      try {
-        //
-        // issue the rename to the fs
-        //
-        rename(argv[i], dest);
-      } catch (RemoteException e) {
-        LOG.debug("Error renaming " + argv[i], e);
-        //
-        // This is a error returned by hadoop server. Print
-        // out the first line of the error mesage.
-        //
-        exitCode = -1;
-        try {
-          String[] content;
-          content = e.getLocalizedMessage().split("\n");
-          System.err.println(cmd.substring(1) + ": " + content[0]);
-        } catch (Exception ex) {
-          System.err.println(cmd.substring(1) + ": " +
-                             ex.getLocalizedMessage());
-        }
-      } catch (IOException e) {
-        LOG.debug("Error renaming " + argv[i], e);
-        //
-        // IO exception encountered locally.
-        // 
-        exitCode = -1;
-        displayError(cmd, e);
-      }
-    }
-    return exitCode;
-  }
-
-  /**
-   * Copy files that match the file pattern <i>srcf</i>
-   * to a destination file.
-   * When copying mutiple files, the destination must be a directory. 
-   * Otherwise, IOException is thrown.
-   * @param srcf a file pattern specifying source files
-   * @param dstf a destination local file/directory 
-   * @throws IOException  
-   * @see org.apache.hadoop.fs.FileSystem#globStatus(Path)
-   */
-  void copy(String srcf, String dstf, Configuration conf) throws IOException {
-    Path srcPath = new Path(srcf);
-    FileSystem srcFs = srcPath.getFileSystem(getConf());
-    Path dstPath = new Path(dstf);
-    FileSystem dstFs = dstPath.getFileSystem(getConf());
-    Path [] srcs = FileUtil.stat2Paths(srcFs.globStatus(srcPath), srcPath);
-    if (srcs.length > 1 && !dstFs.isDirectory(dstPath)) {
-      throw new IOException("When copying multiple files, " 
-                            + "destination should be a directory.");
-    }
-    for(int i=0; i<srcs.length; i++) {
-      FileUtil.copy(srcFs, srcs[i], dstFs, dstPath, false, conf);
-    }
-  }
-
-  /**
-   * Copy file(s) to a destination file. Multiple source
-   * files can be specified. The destination is the last element of
-   * the argvp[] array.
-   * If multiple source files are specified, then the destination 
-   * must be a directory. Otherwise, IOException is thrown.
-   * @throws IOException on error
-   */
-  private int copy(String argv[], Configuration conf) throws IOException {
-    int i = 0;
-    int exitCode = 0;
-    String cmd = argv[i++];  
-    String dest = argv[argv.length-1];
-    //
-    // If the user has specified multiple source files, then
-    // the destination has to be a directory
-    //
-    if (argv.length > 3) {
-      Path dst = new Path(dest);
-      FileSystem pFS = dst.getFileSystem(conf);
-      if (!pFS.isDirectory(dst)) {
-        throw new IOException("When copying multiple files, " 
-                              + "destination " + dest + " should be a directory.");
-      }
-    }
-    //
-    // for each source file, issue the copy
-    //
-    for (; i < argv.length - 1; i++) {
-      try {
-        //
-        // issue the copy to the fs
-        //
-        copy(argv[i], dest, conf);
-      } catch (IOException e) {
-        LOG.debug("Error copying " + argv[i], e);
-        exitCode = -1;
-        displayError(cmd, e);
-      }
-    }
-    return exitCode;
-  }
-
   /**
    * Returns the Trash object associated with this shell.
    */
@@ -515,11 +106,6 @@ public class FsShell extends Configured 
       "The full syntax is: \n\n" +
       "hadoop fs [-fs <local | file system URI>] [-conf <configuration file>]\n\t" +
       "[-D <property=value>]\n\t" +
-      "[-mv <src> <dst>] [-cp <src> <dst>]\n\t" + 
-      "[-put <localsrc> ... <dst>] [-copyFromLocal <localsrc> ... <dst>]\n\t" +
-      "[-moveFromLocal <localsrc> ... <dst>] [" + 
-      GET_SHORT_USAGE + "\n\t" +
-      "[" + COPYTOLOCAL_SHORT_USAGE + "] [-moveToLocal <src> <localdst>]\n\t" +
       "[-report]";
 
     String conf ="-conf <configuration file>:  Specify an application configuration file.";
@@ -537,33 +123,6 @@ public class FsShell extends Configured 
       "\t\tappear first on the command line.  Exactly one additional\n" +
       "\t\targument must be specified. \n";
 
-    String mv = "-mv <src> <dst>:   Move files that match the specified file pattern <src>\n" +
-      "\t\tto a destination <dst>.  When moving multiple files, the \n" +
-      "\t\tdestination must be a directory. \n";
-
-    String cp = "-cp <src> <dst>:   Copy files that match the file pattern <src> to a \n" +
-      "\t\tdestination.  When copying multiple files, the destination\n" +
-      "\t\tmust be a directory. \n";
-
-    String put = "-put <localsrc> ... <dst>: \tCopy files " + 
-    "from the local file system \n\t\tinto fs. \n";
-
-    String copyFromLocal = "-copyFromLocal <localsrc> ... <dst>:" +
-    " Identical to the -put command.\n";
-
-    String moveFromLocal = "-moveFromLocal <localsrc> ... <dst>:" +
-    " Same as -put, except that the source is\n\t\tdeleted after it's copied.\n"; 
-
-    String get = GET_SHORT_USAGE
-      + ":  Copy files that match the file pattern <src> \n" +
-      "\t\tto the local name.  <src> is kept.  When copying mutiple, \n" +
-      "\t\tfiles, the destination must be a directory. \n";
-
-    String copyToLocal = COPYTOLOCAL_SHORT_USAGE
-                         + ":  Identical to the -get command.\n";
-
-    String moveToLocal = "-moveToLocal <src> <localdst>:  Not implemented yet \n";
-        
     String help = "-help [cmd]: \tDisplays help for given command or all commands if none\n" +
       "\t\tis specified.\n";
 
@@ -576,24 +135,6 @@ public class FsShell extends Configured 
       System.out.println(conf);
     } else if ("D".equals(cmd)) {
       System.out.println(D);
-    } else if ("mv".equals(cmd)) {
-      System.out.println(mv);
-    } else if ("cp".equals(cmd)) {
-      System.out.println(cp);
-    } else if ("put".equals(cmd)) {
-      System.out.println(put);
-    } else if ("copyFromLocal".equals(cmd)) {
-      System.out.println(copyFromLocal);
-    } else if ("moveFromLocal".equals(cmd)) {
-      System.out.println(moveFromLocal);
-    } else if ("get".equals(cmd)) {
-      System.out.println(get);
-    } else if ("copyToLocal".equals(cmd)) {
-      System.out.println(copyToLocal);
-    } else if ("moveToLocal".equals(cmd)) {
-      System.out.println(moveToLocal);
-    } else if ("get".equals(cmd)) {
-      System.out.println(get);
     } else if ("help".equals(cmd)) {
       System.out.println(help);
     } else {
@@ -607,14 +148,6 @@ public class FsShell extends Configured 
       System.out.println("\t[-help [cmd]]\n");
       
       System.out.println(fs);
-      System.out.println(mv);
-      System.out.println(cp);
-      System.out.println(put);
-      System.out.println(copyFromLocal);
-      System.out.println(moveFromLocal);
-      System.out.println(get);
-      System.out.println(copyToLocal);
-      System.out.println(moveToLocal);
 
       for (String thisCmdName : commandFactory.getNames()) {
         instance = commandFactory.getInstance(thisCmdName);
@@ -661,30 +194,8 @@ public class FsShell extends Configured 
     } else if ("-D".equals(cmd)) {
       System.err.println("Usage: java FsShell" + 
                          " [-D <[property=value>]");
-    } else if ("-mv".equals(cmd) || "-cp".equals(cmd)) {
-      System.err.println("Usage: java FsShell" + 
-                         " [" + cmd + " <src> <dst>]");
-    } else if ("-put".equals(cmd) || "-copyFromLocal".equals(cmd) ||
-               "-moveFromLocal".equals(cmd)) {
-      System.err.println("Usage: java FsShell" + 
-                         " [" + cmd + " <localsrc> ... <dst>]");
-    } else if ("-get".equals(cmd)) {
-      System.err.println("Usage: java FsShell [" + GET_SHORT_USAGE + "]"); 
-    } else if ("-copyToLocal".equals(cmd)) {
-      System.err.println("Usage: java FsShell [" + COPYTOLOCAL_SHORT_USAGE+ "]"); 
-    } else if ("-moveToLocal".equals(cmd)) {
-      System.err.println("Usage: java FsShell" + 
-                         " [" + cmd + " [-crc] <src> <localdst>]");
     } else {
       System.err.println("Usage: java FsShell");
-      System.err.println("           [-mv <src> <dst>]");
-      System.err.println("           [-cp <src> <dst>]");
-      System.err.println("           [-put <localsrc> ... <dst>]");
-      System.err.println("           [-copyFromLocal <localsrc> ... <dst>]");
-      System.err.println("           [-moveFromLocal <localsrc> ... <dst>]");
-      System.err.println("           [" + GET_SHORT_USAGE + "]");
-      System.err.println("           [" + COPYTOLOCAL_SHORT_USAGE + "]");
-      System.err.println("           [-moveToLocal [-crc] <src> <localdst>]");
       for (String name : commandFactory.getNames()) {
         instance = commandFactory.getInstance(name);
         if (!instance.isDeprecated()) {
@@ -715,27 +226,6 @@ public class FsShell extends Configured 
     int exitCode = -1;
     int i = 0;
     String cmd = argv[i++];
-    //
-    // verify that we have enough command line parameters
-    //
-    if ("-put".equals(cmd) ||
-        "-copyFromLocal".equals(cmd) || "-moveFromLocal".equals(cmd)) {
-      if (argv.length < 3) {
-        printUsage(cmd);
-        return exitCode;
-      }
-    } else if ("-get".equals(cmd) || 
-               "-copyToLocal".equals(cmd) || "-moveToLocal".equals(cmd)) {
-      if (argv.length < 3) {
-        printUsage(cmd);
-        return exitCode;
-      }
-    } else if ("-mv".equals(cmd) || "-cp".equals(cmd)) {
-      if (argv.length < 3) {
-        printUsage(cmd);
-        return exitCode;
-      }
-    }
     // initialize FsShell
     try {
       init();
@@ -751,38 +241,10 @@ public class FsShell extends Configured 
       return exitCode;
     }
 
-    exitCode = 0;
     try {
       Command instance = commandFactory.getInstance(cmd);
       if (instance != null) {
-        try {
-          exitCode = instance.run(Arrays.copyOfRange(argv, i, argv.length));
-        } catch (Exception e) {
-          exitCode = -1;
-          LOG.debug("Error", e);
-          instance.displayError(e);
-          if (e instanceof IllegalArgumentException) {
-            printUsage(cmd);
-          }
-        }
-      } else if ("-put".equals(cmd) || "-copyFromLocal".equals(cmd)) {
-        Path[] srcs = new Path[argv.length-2];
-        for (int j=0 ; i < argv.length-1 ;) 
-          srcs[j++] = new Path(argv[i++]);
-        copyFromLocal(srcs, argv[i++]);
-      } else if ("-moveFromLocal".equals(cmd)) {
-        Path[] srcs = new Path[argv.length-2];
-        for (int j=0 ; i < argv.length-1 ;) 
-          srcs[j++] = new Path(argv[i++]);
-        moveFromLocal(srcs, argv[i++]);
-      } else if ("-get".equals(cmd) || "-copyToLocal".equals(cmd)) {
-        copyToLocal(argv, i);
-      } else if ("-moveToLocal".equals(cmd)) {
-        moveToLocal(argv[i++], new Path(argv[i++]));
-      } else if ("-mv".equals(cmd)) {
-        exitCode = rename(argv, getConf());
-      } else if ("-cp".equals(cmd)) {
-        exitCode = copy(argv, getConf());
+        exitCode = instance.run(Arrays.copyOfRange(argv, i, argv.length));
       } else if ("-help".equals(cmd)) {
         if (i < argv.length) {
           printHelp(argv[i]);
@@ -790,20 +252,17 @@ public class FsShell extends Configured 
           printHelp("");
         }
       } else {
-        exitCode = -1;
-        System.err.println(cmd.substring(1) + ": Unknown command");
+        System.err.println(cmd + ": Unknown command");
         printUsage("");
       }
-    } catch (IllegalArgumentException arge) {
-      LOG.debug("Error", arge);
-      exitCode = -1;
-      System.err.println(cmd.substring(1) + ": " + arge.getLocalizedMessage());
-      printUsage(cmd);
-    } catch (Exception re) {
-      LOG.debug("Error", re);
-      exitCode = -1;
-      displayError(cmd, re);
-    } finally {
+    } catch (Exception e) {
+      exitCode = 1;
+      LOG.debug("Error", e);
+      displayError(cmd, e);
+      if (e instanceof IllegalArgumentException) {
+        exitCode = -1;
+        printUsage(cmd);
+      }
     }
     return exitCode;
   }

Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/FsCommand.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/FsCommand.java?rev=1127731&r1=1127730&r2=1127731&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/FsCommand.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/FsCommand.java Wed May 25 23:40:03 2011
@@ -43,7 +43,7 @@ abstract public class FsCommand extends 
    * @param factory where to register the class
    */
   public static void registerCommands(CommandFactory factory) {
-    factory.registerCommands(Copy.class);
+    factory.registerCommands(CopyCommands.class);
     factory.registerCommands(Count.class);
     factory.registerCommands(Delete.class);
     factory.registerCommands(Display.class);
@@ -51,6 +51,7 @@ abstract public class FsCommand extends 
     factory.registerCommands(FsUsage.class);
     factory.registerCommands(Ls.class);
     factory.registerCommands(Mkdir.class);
+    factory.registerCommands(MoveCommands.class);
     factory.registerCommands(SetReplication.class);
     factory.registerCommands(Stat.class);
     factory.registerCommands(Tail.class);

Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Ls.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Ls.java?rev=1127731&r1=1127730&r2=1127731&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Ls.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Ls.java Wed May 25 23:40:03 2011
@@ -127,9 +127,6 @@ class Ls extends FsCommand {
     return Math.max(n, (value != null) ? String.valueOf(value).length() : 0);
   }
 
-  @Override
-  protected int exitCodeForError() { return -1; }
-
   /**
    * Get a recursive listing of all files in that match the file patterns.
    * Same as "-ls -R"

Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/PathData.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/PathData.java?rev=1127731&r1=1127730&r2=1127731&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/PathData.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/PathData.java Wed May 25 23:40:03 2011
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.fs.shell;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
@@ -59,6 +60,21 @@ public class PathData {
   }
   
   /**
+   * Creates an object to wrap the given parameters as fields.  The string
+   * used to create the path will be recorded since the Path object does not
+   * return exactly the same string used to initialize it
+   * @param localPath a local File
+   * @param conf the configuration file
+   * @throws IOException if anything goes wrong...
+   */
+  public PathData(File localPath, Configuration conf) throws IOException {
+    this.string = localPath.toString();
+    this.path = new Path(this.string);
+    this.fs = FileSystem.getLocal(conf);
+    setStat(getStat(fs, path));
+  }
+
+  /**
    * Creates an object to wrap the given parameters as fields. 
    * @param fs the FileSystem
    * @param path a Path
@@ -157,6 +173,19 @@ public class PathData {
   }
 
   /**
+   * Creates a new object for a child entry in this directory
+   * @param child the basename will be appended to this object's path
+   * @return PathData for the child
+   * @throws IOException if this object does not exist or is not a directory
+   */
+  public PathData getPathDataForChild(PathData child) throws IOException {
+    if (!stat.isDirectory()) {
+      throw new PathIsNotDirectoryException(string);
+    }
+    return new PathData(fs, new Path(path, child.path.getName()));
+  }
+
+  /**
    * Expand the given path as a glob pattern.  Non-existent paths do not
    * throw an exception because creation commands like touch and mkdir need
    * to create them.  The "stat" field will be null if the path does not

Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/PathExceptions.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/PathExceptions.java?rev=1127731&r1=1127730&r2=1127731&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/PathExceptions.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/PathExceptions.java Wed May 25 23:40:03 2011
@@ -40,7 +40,9 @@ public class PathExceptions {
     // NOTE: this really should be a Path, but a Path is buggy and won't
     // return the exact string used to construct the path, and it mangles
     // uris with no authority
+    private String operation;
     private String path;
+    private String targetPath;
 
     /**
      * Constructor a generic I/O error exception
@@ -74,17 +76,53 @@ public class PathExceptions {
       this.path = path;
     }
 
+    /** Format:
+     * cmd: {operation} `path' {to `target'}: error string
+     */
     @Override
     public String getMessage() {
-      String message = "`" + path + "': " + super.getMessage();
+      StringBuilder message = new StringBuilder();
+      if (operation != null) {
+        message.append(operation + " ");
+      }
+      message.append(formatPath(path));
+      if (targetPath != null) {
+        message.append(" to " + formatPath(targetPath));
+      }
+      message.append(": " + super.getMessage());
       if (getCause() != null) {
-        message += ": " + getCause().getMessage();
+        message.append(": " + getCause().getMessage());
       }
-      return message;
+      return message.toString();
     }
 
     /** @return Path that generated the exception */
     public Path getPath()  { return new Path(path); }
+
+    /** @return Path if the operation involved copying or moving, else null */
+    public Path getTargetPath() {
+      return (targetPath != null) ? new Path(targetPath) : null;
+    }    
+    
+    /**
+     * Optional operation that will preface the path
+     * @param operation a string
+     */
+    public void setOperation(String operation) {
+      this.operation = operation;
+    }
+    
+    /**
+     * Optional path if the exception involved two paths, ex. a copy operation
+     * @param targetPath the of the operation
+     */
+    public void setTargetPath(String targetPath) {
+      this.targetPath = targetPath;
+    }
+    
+    private String formatPath(String path) {
+      return "`" + path + "'";
+    }
   }
 
   /** ENOENT */
@@ -144,4 +182,13 @@ public class PathExceptions {
       super(path, "Operation not permitted");
     }
   }
-}
+  
+  /** ENOTSUP */
+  public static class PathOperationException extends PathExistsException {
+    static final long serialVersionUID = 0L;
+    /** @param path for the exception */
+    public PathOperationException(String path) {
+      super(path, "Operation not supported");
+    }
+  }
+}
\ No newline at end of file

Propchange: hadoop/common/branches/yahoo-merge/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 23:40:03 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:1043117,1076296,1078148,1080396,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426
+/hadoop/common/trunk/src/test/core:1043117,1076296,1078148,1080396,1081598,1082329,1082787-1082788,1084415,1084769,1085043,1085122,1086309,1087159,1087844,1090039,1090485,1091618,1091902,1091970,1092519,1092565,1094750,1095121,1095761,1096522,1096988,1099612,1099633,1100026,1100356,1100369,1100400,1101132,1101199,1101653,1102012,1102068,1102093,1102861,1102940,1103968,1104426,1127591
 /hadoop/core/branches/branch-0.19/core/src/test/core:713112
 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278

Modified: hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/cli/testConf.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/cli/testConf.xml?rev=1127731&r1=1127730&r2=1127731&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/cli/testConf.xml (original)
+++ hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/cli/testConf.xml Wed May 25 23:40:03 2011
@@ -117,11 +117,11 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-get( )*\[-ignoreCrc\]( )*\[-crc\]( )*&lt;src&gt; &lt;localdst&gt;:( |\t)*Copy files that match the file pattern &lt;src&gt;( )*</expected-output>
+          <expected-output>^-get( )*\[-ignoreCrc\]( )*\[-crc\]( )*&lt;src&gt; \.\.\. &lt;localdst&gt;:( |\t)*Copy files that match the file pattern &lt;src&gt;( )*</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^( |\t)*to the local name.( )*&lt;src&gt; is kept.( )*When copying mutiple,( )*</expected-output>
+          <expected-output>^( |\t)*to the local name.( )*&lt;src&gt; is kept.( )*When copying multiple,( )*</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
@@ -237,7 +237,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-mv &lt;src&gt; &lt;dst&gt;:( |\t)*Move files that match the specified file pattern &lt;src&gt;( )*</expected-output>
+          <expected-output>^-mv &lt;src&gt; \.\.\. &lt;dst&gt;:( |\t)*Move files that match the specified file pattern &lt;src&gt;( )*</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
@@ -260,7 +260,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-cp &lt;src&gt; &lt;dst&gt;:( |\t)*Copy files that match the file pattern &lt;src&gt; to a( )*</expected-output>
+          <expected-output>^-cp &lt;src&gt; \.\.\. &lt;dst&gt;:( |\t)*Copy files that match the file pattern &lt;src&gt; to a( )*</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
@@ -325,7 +325,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-put &lt;localsrc&gt; ... &lt;dst&gt;:( |\t)*Copy files from the local file system( )*</expected-output>
+          <expected-output>^-put &lt;localsrc&gt; \.\.\. &lt;dst&gt;:\s+Copy files from the local file system</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
@@ -344,7 +344,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-copyFromLocal &lt;localsrc&gt; ... &lt;dst&gt;:( )*Identical to the -put command.( )*</expected-output>
+          <expected-output>^-copyFromLocal &lt;localsrc&gt; \.\.\. &lt;dst&gt;:\s+Identical to the -put command\.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -359,11 +359,11 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-moveFromLocal &lt;localsrc&gt; ... &lt;dst&gt;: Same as -put, except that the source is( )*</expected-output>
+          <expected-output>^-moveFromLocal &lt;localsrc&gt; \.\.\. &lt;dst&gt;:\s+Same as -put, except that the source is</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^( |\t)*deleted after it's copied.( )*</expected-output>
+          <expected-output>^( |\t)*deleted after it's copied.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -379,11 +379,11 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-get( )*\[-ignoreCrc\]( )*\[-crc\]( )*&lt;src&gt; &lt;localdst&gt;:( |\t)*Copy files that match the file pattern &lt;src&gt;( )*</expected-output>
+          <expected-output>^-get( )*\[-ignoreCrc\]( )*\[-crc\]( )*&lt;src&gt; \.\.\. &lt;localdst&gt;:( |\t)*Copy files that match the file pattern &lt;src&gt;( )*</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^( |\t)*to the local name.( )*&lt;src&gt; is kept.( )*When copying mutiple,( )*</expected-output>
+          <expected-output>^( |\t)*to the local name.( )*&lt;src&gt; is kept.( )*When copying multiple,( )*</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
@@ -445,7 +445,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-copyToLocal \[-ignoreCrc\] \[-crc\] &lt;src&gt; &lt;localdst&gt;:( )*Identical to the -get command.( )*</expected-output>
+          <expected-output>^-copyToLocal \[-ignoreCrc\] \[-crc\] &lt;src&gt; \.\.\. &lt;localdst&gt;:\s+Identical to the -get command.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -460,7 +460,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-moveToLocal &lt;src&gt; &lt;localdst&gt;:( )*Not implemented yet( )*</expected-output>
+          <expected-output>^-moveToLocal &lt;src&gt; &lt;localdst&gt;:\s+Not implemented yet</expected-output>
         </comparator>
       </comparators>
     </test>

Modified: hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/TestFsShellReturnCode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/TestFsShellReturnCode.java?rev=1127731&r1=1127730&r2=1127731&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/TestFsShellReturnCode.java (original)
+++ hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/TestFsShellReturnCode.java Wed May 25 23:40:03 2011
@@ -50,7 +50,7 @@ public class TestFsShellReturnCode {
   
   @BeforeClass
   public static void setup() throws IOException {
-    conf.setClass("fs.file.impl", LocalFileSystemExtn.class, RawLocalFileSystem.class);
+    conf.setClass("fs.file.impl", LocalFileSystemExtn.class, LocalFileSystem.class);
     fileSys = FileSystem.get(conf);
     fsShell = new FsShell(conf);
   }
@@ -285,7 +285,7 @@ public class TestFsShellReturnCode {
       assertTrue("file exists", !fileSys.exists(new Path(args[1])));
       int run = shell.run(args);
       results = bytes.toString();
-      assertTrue("Return code should be -1", run == -1);
+      assertEquals("Return code should be 1", 1, run);
       assertTrue(" Null is coming when source path is invalid. ",!results.contains("get: null"));
       assertTrue(" Not displaying the intended message ",results.contains("get: `"+args[1]+"': No such file or directory"));
     } finally {
@@ -325,7 +325,13 @@ public class TestFsShellReturnCode {
     
   }
   
-  static class LocalFileSystemExtn extends RawLocalFileSystem {
+  static class LocalFileSystemExtn extends LocalFileSystem {
+    public LocalFileSystemExtn() {
+      super(new RawLocalFileSystemExtn());
+    }
+  }
+
+  static class RawLocalFileSystemExtn extends RawLocalFileSystem {
     protected static HashMap<String,String> owners = new HashMap<String,String>();
     protected static HashMap<String,String> groups = new HashMap<String,String>();
 



Mime
View raw message