From mapreduce-commits-return-2605-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org Tue Oct 25 18:15:07 2011 Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 447439E64 for ; Tue, 25 Oct 2011 18:15:07 +0000 (UTC) Received: (qmail 28029 invoked by uid 500); 25 Oct 2011 18:15:07 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 27998 invoked by uid 500); 25 Oct 2011 18:15:07 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 27990 invoked by uid 99); 25 Oct 2011 18:15:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Oct 2011 18:15:07 +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; Tue, 25 Oct 2011 18:15:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C0086238888F; Tue, 25 Oct 2011 18:14:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1188843 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/jav... Date: Tue, 25 Oct 2011 18:14:45 -0000 To: mapreduce-commits@hadoop.apache.org From: acmurthy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111025181445.C0086238888F@eris.apache.org> Author: acmurthy Date: Tue Oct 25 18:14:45 2011 New Revision: 1188843 URL: http://svn.apache.org/viewvc?rev=1188843&view=rev Log: Merge -c 1188842 from trunk to branch-0.23 to complete fix for MAPREDUCE-3253. Added: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestContextFactory.java - copied unchanged from r1188842, hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestContextFactory.java Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/ContextFactory.java Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1188843&r1=1188842&r2=1188843&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue Oct 25 18:14:45 2011 @@ -1706,6 +1706,9 @@ Release 0.23.0 - Unreleased MAPREDUCE-2821. Added missing fields (resourcePerMap & resourcePerReduce) to JobSummary logs. (mahadev via acmurthy) + MAPREDUCE-3253. Fixed ContextFactory to clone JobContext correctly. + (acmurthy) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/ContextFactory.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/ContextFactory.java?rev=1188843&r1=1188842&r2=1188843&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/ContextFactory.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/ContextFactory.java Tue Oct 25 18:14:45 2011 @@ -24,6 +24,7 @@ import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.mapreduce.lib.map.WrappedMapper; /** * A factory to allow applications to deal with inconsistencies between @@ -123,7 +124,7 @@ public class ContextFactory { WRAPPED_CONTEXT_FIELD = null; } MAP_CONTEXT_CONSTRUCTOR.setAccessible(true); - REPORTER_FIELD = taskIOContextCls.getDeclaredField("reporter"); + REPORTER_FIELD = taskContextCls.getDeclaredField("reporter"); REPORTER_FIELD.setAccessible(true); READER_FIELD = mapContextCls.getDeclaredField("reader"); READER_FIELD.setAccessible(true); @@ -141,7 +142,8 @@ public class ContextFactory { } /** - * Clone a job or task attempt context with a new configuration. + * Clone a {@link JobContext} or {@link TaskAttemptContext} with a + * new configuration. * @param original the original context * @param conf the new configuration * @return a new context object @@ -176,7 +178,8 @@ public class ContextFactory { } /** - * Copy a mapper context, optionally replacing the input and output. + * Copy a custom {@link WrappedMapper.Context}, optionally replacing + * the input and output. * @param input key type * @param input value type * @param output key type