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 2012/04/21 03:26:31 UTC

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

Author: daijy
Date: Sat Apr 21 01:26:31 2012
New Revision: 1328555

URL: http://svn.apache.org/viewvc?rev=1328555&view=rev
Log:
Rollback PIG-2652_1.patch

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

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1328555&r1=1328554&r2=1328555&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sat Apr 21 01:26:31 2012
@@ -112,8 +112,6 @@ PIG-2627: Custom partitioner not set whe
 
 PIG-2596: Jython UDF does not handle boolean output (aniket486 via daijy)
 
-PIG-2652: Skew join and order by don't trigger reducer estimation (billgraham via dvryaboy)
-
 PIG-2649: org.apache.pig.parser.ParserValidationException does not expose the cause exception
 
 PIG-2540: [piggybank] AvroStorage can't read schema on amazon s3 in elastic mapreduce (rjurney via jcoveney)

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java?rev=1328555&r1=1328554&r2=1328555&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java Sat Apr 21 01:26:31 2012
@@ -2521,8 +2521,8 @@ public class MRCompiler extends PhyPlanV
                         val = pigContext.defaultParallel;
                     if (val<=0)
                         val = eng.getJobConf().getNumReduceTasks();
-                    if (val<=1)
-                        val = -1;
+                    if (val<=0)
+                        val = 1;
                 } catch (Exception e) {
                     int errCode = 6015;
                     String msg = "Problem getting the default number of reduces from the Job Client.";