You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2011/12/07 22:54:02 UTC

svn commit: r1211659 - in /pig/trunk: CHANGES.txt shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java

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<Pair<PigNullableWritable, Writable>> 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;
     }
 }