You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by an...@apache.org on 2014/04/30 00:37:13 UTC

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

Author: aniket486
Date: Tue Apr 29 22:37:12 2014
New Revision: 1591129

URL: http://svn.apache.org/r1591129
Log:
PIG-3859: auto local mode should not modify reducer configuration (aniket486)

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=1591129&r1=1591128&r2=1591129&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Apr 29 22:37:12 2014
@@ -117,6 +117,8 @@ PIG-3882: Multiquery off mode execution 
  
 BUG FIXES
 
+PIG-3859: auto local mode should not modify reducer configuration (aniket486)
+
 PIG-3909: Type Casting issue (daijy)
 
 PIG-3905: 0.12.1 release can't be build for Hadoop2 (daijy)

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=1591129&r1=1591128&r2=1591129&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 Tue Apr 29 22:37:12 2014
@@ -578,7 +578,7 @@ public class JobControlCompiler{
                     // override with the default conf to run in local mode
                     for (Entry<String, String> entry : defaultConf) {
                         String key = entry.getKey();
-                        if (key.equals("mapred.reduce.tasks")) {
+                        if (key.equals("mapred.reduce.tasks") || key.equals("mapreduce.job.reduces")) {
                             // this must not be set back to the default in case it has been set to 0 for example.
                             continue;
                         }