From common-commits-return-11128-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org Tue Jun 01 05:07:26 2010 Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 96239 invoked from network); 1 Jun 2010 05:07:26 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Jun 2010 05:07:26 -0000 Received: (qmail 21834 invoked by uid 500); 1 Jun 2010 05:07:25 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 21595 invoked by uid 500); 1 Jun 2010 05:07:23 -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 21588 invoked by uid 99); 1 Jun 2010 05:07:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 05:07:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 01 Jun 2010 05:07:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 89BAB238897A; Tue, 1 Jun 2010 05:06:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r949932 - in /hadoop/common/branches/branch-0.20: CHANGES.txt src/mapred/org/apache/hadoop/mapreduce/Job.java src/mapred/org/apache/hadoop/mapreduce/JobContext.java src/test/org/apache/hadoop/mapreduce/TestMapReduceLocal.java Date: Tue, 01 Jun 2010 05:06:59 -0000 To: common-commits@hadoop.apache.org From: sharad@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100601050659.89BAB238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sharad Date: Tue Jun 1 05:06:59 2010 New Revision: 949932 URL: http://svn.apache.org/viewvc?rev=949932&view=rev Log: MAPREDUCE-118. Fix Job.getJobID(). Contributed by Amareshwari Sriramadasu. Modified: hadoop/common/branches/branch-0.20/CHANGES.txt hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapreduce/Job.java hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapreduce/JobContext.java hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/mapreduce/TestMapReduceLocal.java Modified: hadoop/common/branches/branch-0.20/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/CHANGES.txt?rev=949932&r1=949931&r2=949932&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20/CHANGES.txt Tue Jun 1 05:06:59 2010 @@ -32,6 +32,8 @@ Release 0.20.3 - Unreleased MAPREDUCE-1372. ConcurrentModificationException in JobInProgress. (Dick King and Amareshwari Sriramadasu via tomwhite) + MAPREDUCE-118. Fix Job.getJobID(). (Amareshwari Sriramadasu via sharad) + IMPROVEMENTS MAPREDUCE-1407. Update javadoc in mapreduce.{Mapper,Reducer} to match Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapreduce/Job.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapreduce/Job.java?rev=949932&r1=949931&r2=949932&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapreduce/Job.java (original) +++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapreduce/Job.java Tue Jun 1 05:06:59 2010 @@ -430,6 +430,7 @@ public class Job extends JobContext { ensureState(JobState.DEFINE); setUseNewAPI(); info = jobClient.submitJobInternal(conf); + super.setJobID(info.getID()); state = JobState.RUNNING; } Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapreduce/JobContext.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapreduce/JobContext.java?rev=949932&r1=949931&r2=949932&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapreduce/JobContext.java (original) +++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapreduce/JobContext.java Tue Jun 1 05:06:59 2010 @@ -46,13 +46,17 @@ public class JobContext { "mapreduce.partitioner.class"; protected final org.apache.hadoop.mapred.JobConf conf; - private final JobID jobId; + private JobID jobId; public JobContext(Configuration conf, JobID jobId) { this.conf = new org.apache.hadoop.mapred.JobConf(conf); this.jobId = jobId; } + void setJobID(JobID jobId) { + this.jobId = jobId; + } + /** * Return the configuration for the job. * @return the shared configuration object Modified: hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/mapreduce/TestMapReduceLocal.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/mapreduce/TestMapReduceLocal.java?rev=949932&r1=949931&r2=949932&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/mapreduce/TestMapReduceLocal.java (original) +++ hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/mapreduce/TestMapReduceLocal.java Tue Jun 1 05:06:59 2010 @@ -137,7 +137,9 @@ public class TestMapReduceLocal extends job.setInputFormatClass(TrackingTextInputFormat.class); FileInputFormat.addInputPath(job, new Path(TEST_ROOT_DIR + "/in")); FileOutputFormat.setOutputPath(job, new Path(TEST_ROOT_DIR + "/out")); + assertNull(job.getJobID()); assertTrue(job.waitForCompletion(false)); + assertNotNull(job.getJobID()); String out = readFile("out/part-r-00000"); System.out.println(out); assertEquals("a\t1\ncount\t1\nis\t1\nmore\t1\nof\t1\ntest\t4\nthis\t1\nword\t1\n",