Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4C42A4C44 for ; Mon, 23 May 2011 21:44:37 +0000 (UTC) Received: (qmail 25067 invoked by uid 500); 23 May 2011 21:44:37 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 25040 invoked by uid 500); 23 May 2011 21:44:37 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 25031 invoked by uid 99); 23 May 2011 21:44:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 May 2011 21:44:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 May 2011 21:44:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 451DD238890A; Mon, 23 May 2011 21:44:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1126766 - 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/ Date: Mon, 23 May 2011 21:44:11 -0000 To: common-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110523214412.451DD238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: szetszwo Date: Mon May 23 21:44:11 2011 New Revision: 1126766 URL: http://svn.apache.org/viewvc?rev=1126766&view=rev Log: svn merge -c 1090485 from trunk for HADOOP-7216. 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/Command.java hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Count.java hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/FsCommand.java hadoop/common/branches/yahoo-merge/src/test/core/ (props changed) Propchange: hadoop/common/branches/yahoo-merge/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 23 21:44:11 2011 @@ -1,2 +1,2 @@ -/hadoop/common/trunk:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1091618,1092565,1100026 +/hadoop/common/trunk:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1092565,1100026 /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=1126766&r1=1126765&r2=1126766&view=diff ============================================================================== --- hadoop/common/branches/yahoo-merge/CHANGES.txt (original) +++ hadoop/common/branches/yahoo-merge/CHANGES.txt Mon May 23 21:44:11 2011 @@ -40,6 +40,9 @@ Trunk (unreleased changes) HADOOP-7268. FileContext.getLocalFSFileContext() behavior needs to be fixed w.r.t tokens. (jitendra) + HADOOP-7216. Add FsCommand.runAll() with deprecated annotation for the + transition of Command base class improvement. (Daryn Sharp via szetszwo) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/yahoo-merge/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 23 21:44:11 2011 @@ -1,4 +1,4 @@ -/hadoop/common/trunk/CHANGES.txt:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1091618,1092565,1092832,1100026 +/hadoop/common/trunk/CHANGES.txt:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1092565,1092832,1100026 /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 Mon May 23 21:44:11 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/contrib/ec2:1043117,1078148,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1091618,1092565,1100026 +/hadoop/common/trunk/src/contrib/ec2:1043117,1078148,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1092565,1100026 /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 Mon May 23 21:44:11 2011 @@ -1,2 +1,2 @@ -/hadoop/common/trunk/src/docs:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1091618,1092565,1100026 +/hadoop/common/trunk/src/docs:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1092565,1100026 /hadoop/core/branches/branch-0.19/src/docs:713112 Propchange: hadoop/common/branches/yahoo-merge/src/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 23 21:44:11 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/java:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1091618,1092565,1100026 +/hadoop/common/trunk/src/java:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1092565,1100026 /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=1126766&r1=1126765&r2=1126766&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 Mon May 23 21:44:11 2011 @@ -1937,11 +1937,9 @@ public class FsShell extends Configured } else if ("-count".equals(cmd)) { // TODO: next two lines are a temporary crutch until this entire // block is overhauled - LinkedList args = new LinkedList(Arrays.asList(argv)); - String cmdName = args.removeFirst(); Count runner = ReflectionUtils.newInstance(Count.class, getConf()); - runner.setCommandName(cmdName); // TODO: will change with factory - exitCode = runner.run(args); + runner.setCommandName(cmd); // TODO: will change with factory + exitCode = runner.run(Arrays.copyOfRange(argv, 1, argv.length)); } else if ("-mkdir".equals(cmd)) { exitCode = doall(cmd, argv, i); } else if ("-touchz".equals(cmd)) { Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Command.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Command.java?rev=1126766&r1=1126765&r2=1126766&view=diff ============================================================================== --- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Command.java (original) +++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Command.java Mon May 23 21:44:11 2011 @@ -21,6 +21,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.PrintStream; import java.util.ArrayList; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -124,11 +125,12 @@ abstract public class Command extends Co * Most commands will chose to implement just * {@link #processOptions(LinkedList)} and {@link #processPath(PathData)} * - * @param args the list of command line arguments + * @param argv the list of command line arguments * @return the exit code for the command * @throws IllegalArgumentException if called with invalid arguments */ - public int run(LinkedList args) { + public int run(String...argv) { + LinkedList args = new LinkedList(Arrays.asList(argv)); try { processOptions(args); processArguments(expandArguments(args)); Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Count.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Count.java?rev=1126766&r1=1126765&r2=1126766&view=diff ============================================================================== --- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Count.java (original) +++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/shell/Count.java Mon May 23 21:44:11 2011 @@ -60,10 +60,7 @@ public class Count extends FsCommand { public Count(String[] cmd, int pos, Configuration conf) { super(conf); setCommandName(NAME); - LinkedList parameters = new LinkedList(Arrays.asList(cmd)); - parameters.subList(0, pos).clear(); - processOptions(parameters); - this.args = parameters.toArray(new String[0]); + this.args = Arrays.copyOfRange(cmd, pos, cmd.length); } @Override 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=1126766&r1=1126765&r2=1126766&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 Mon May 23 21:44:11 2011 @@ -47,7 +47,16 @@ abstract public class FsCommand extends return name.startsWith("-") ? name.substring(1) : name; } + // abstract method that normally is invoked by runall() which is + // overridden below protected void run(Path path) throws IOException { throw new RuntimeException("not supposed to get here"); } + + /** @deprecated use {@link #run(String...argv)} */ + @Deprecated + @Override + public int runAll() { + return run(args); + } } Propchange: hadoop/common/branches/yahoo-merge/src/test/core/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 23 21:44:11 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/test/core:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1091618,1092565,1100026 +/hadoop/common/trunk/src/test/core:1043117,1078148,1080396,1081598,1082329,1082787-1082788,1084769,1085043,1085122,1086309,1087844,1090039,1090485,1091618,1092565,1100026 /hadoop/core/branches/branch-0.19/core/src/test/core:713112 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278