Return-Path: X-Original-To: apmail-pig-commits-archive@www.apache.org Delivered-To: apmail-pig-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 998457EF6 for ; Wed, 7 Dec 2011 21:54:24 +0000 (UTC) Received: (qmail 89094 invoked by uid 500); 7 Dec 2011 21:54:24 -0000 Delivered-To: apmail-pig-commits-archive@pig.apache.org Received: (qmail 89074 invoked by uid 500); 7 Dec 2011 21:54:24 -0000 Mailing-List: contact commits-help@pig.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pig.apache.org Delivered-To: mailing list commits@pig.apache.org Received: (qmail 89067 invoked by uid 99); 7 Dec 2011 21:54:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 21:54:24 +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; Wed, 07 Dec 2011 21:54:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B05C5238897F for ; Wed, 7 Dec 2011 21:54:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1211659 - in /pig/trunk: CHANGES.txt shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java Date: Wed, 07 Dec 2011 21:54:02 -0000 To: commits@pig.apache.org From: daijy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111207215402.B05C5238897F@eris.apache.org> Author: daijy Date: Wed Dec 7 21:54:02 2011 New Revision: 1211659 URL: http://svn.apache.org/viewvc?rev=1211659&view=rev Log: PIG-2402: inIllustrator condition in PigMapReduce is wrong for hadoop 23 Modified: pig/trunk/CHANGES.txt pig/trunk/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java Modified: pig/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1211659&r1=1211658&r2=1211659&view=diff ============================================================================== --- pig/trunk/CHANGES.txt (original) +++ pig/trunk/CHANGES.txt Wed Dec 7 21:54:02 2011 @@ -324,6 +324,8 @@ Release 0.9.2 - Unreleased BUG FIXES +PIG-2402: inIllustrator condition in PigMapReduce is wrong for hadoop 23 (daijy) + PIG-2370: SkewedParitioner results in Kerberos error (daijy) PIG-2374: streaming regression with dotNext (daijy) Modified: pig/trunk/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java URL: http://svn.apache.org/viewvc/pig/trunk/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java?rev=1211659&r1=1211658&r2=1211659&view=diff ============================================================================== --- pig/trunk/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java (original) +++ pig/trunk/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java Wed Dec 7 21:54:02 2011 @@ -86,6 +86,7 @@ abstract public class PigMapBase extends List> output, InputSplit split) throws IOException, InterruptedException { super(conf, new TaskAttemptID(), null, null, null, new IllustrateDummyReporter(), split); + conf.set("inIllustrator", "true"); if (output == null) throw new IOException("Null output can not be used"); this.input = input; this.output = output; @@ -132,6 +133,6 @@ abstract public class PigMapBase extends @Override public boolean inIllustrator(Context context) { - return (context instanceof WrappedMapper.Context); + return ((WrappedMapper.Context)context).getConfiguration().get("inIllustrator")!=null; } }