You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by kn...@apache.org on 2015/08/12 19:10:01 UTC

svn commit: r1695581 - in /pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java

Author: knoguchi
Date: Wed Aug 12 17:10:01 2015
New Revision: 1695581

URL: http://svn.apache.org/r1695581
Log:
PIG-4628: Pig 0.14 job with order by fails in mapreduce mode with Oozie (knoguchi)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1695581&r1=1695580&r2=1695581&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Aug 12 17:10:01 2015
@@ -38,6 +38,8 @@ PIG-4639: Add better parser for Apache H
 
 BUG FIXES
 
+PIG-4628: Pig 0.14 job with order by fails in mapreduce mode with Oozie (knoguchi)
+
 PIG-4651: Optimize NullablePartitionWritable serialization for skewed join (rohini)
 
 PIG-4627: [Pig on Tez] Self join does not handle null values correctly (rohini)

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java?rev=1695581&r1=1695580&r2=1695581&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java Wed Aug 12 17:10:01 2015
@@ -697,6 +697,11 @@ public class JobControlCompiler{
             conf.set("pig.inpTargets", ObjectSerializer.serialize(inpTargets));
             conf.set("pig.inpSignatures", ObjectSerializer.serialize(inpSignatureLists));
             conf.set("pig.inpLimits", ObjectSerializer.serialize(inpLimits));
+
+            // Removing job credential entry before serializing pigcontext into jobconf
+            // since this path would be invalid for the new job being created 
+            pigContext.getProperties().remove("mapreduce.job.credentials.binary");
+
             conf.set("pig.pigContext", ObjectSerializer.serialize(pigContext));
             conf.set("udf.import.list", ObjectSerializer.serialize(PigContext.getPackageImportList()));
             // this is for unit tests since some don't create PigServer