svn commit: r1326022 - in /pig/branches/branch-0.10: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java

[dv...@apache.org]

Author: dvryaboy
Date: Sat Apr 14 00:06:53 2012
New Revision: 1326022

URL: http://svn.apache.org/viewvc?rev=1326022&view=rev
Log:
PIG-2652: Skew join and order by dont trigger reducer estimation

Modified:
    pig/branches/branch-0.10/CHANGES.txt
    pig/branches/branch-0.10/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java

Modified: pig/branches/branch-0.10/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/CHANGES.txt?rev=1326022&r1=1326021&r2=1326022&view=diff
==============================================================================
--- pig/branches/branch-0.10/CHANGES.txt (original)
+++ pig/branches/branch-0.10/CHANGES.txt Sat Apr 14 00:06:53 2012
@@ -190,6 +190,8 @@ PIG-2228: support partial aggregation in
 
 BUG FIXES
 
+PIG-2652: Skew join and order by don't trigger reducer estimation (billgraham via dvryaboy)
+
 PIG-2623: Support S3 paths for registering UDFs (nshkrob via daijy)
 
 PIG-2540: [piggybank] AvroStorage can't read schema on amazon s3 in elastic mapreduce (rjurney via jcoveney)

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