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 2014/07/27 06:48:19 UTC

svn commit: r1613749 - in /pig/trunk/src/org/apache/pig: backend/hadoop/executionengine/tez/TezDagBuilder.java impl/builtin/FindQuantiles.java

Author: daijy
Date: Sun Jul 27 04:48:18 2014
New Revision: 1613749

URL: http://svn.apache.org/r1613749
Log:
PIG-4064: Fix tez auto parallelism test failures (PIG-4064-addendum.patch)

Modified:
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java
    pig/trunk/src/org/apache/pig/impl/builtin/FindQuantiles.java

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java?rev=1613749&r1=1613748&r2=1613749&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java Sun Jul 27 04:48:18 2014
@@ -349,7 +349,7 @@ public class TezDagBuilder extends TezOp
         in.setUserPayload(TezUtils.createUserPayloadFromConf(conf));
         out.setUserPayload(TezUtils.createUserPayloadFromConf(conf));
 
-        if (from.isSampleBasedPartitioner() && to.getEstimatedParallelism()!=-1 && (to.isGlobalSort()||to.isSkewedJoin())) {
+        if (edge.dataMovementType!=DataMovementType.BROADCAST && to.getEstimatedParallelism()!=-1 && (to.isGlobalSort()||to.isSkewedJoin())) {
             // Use custom edge
             return new EdgeProperty((EdgeManagerDescriptor)null,
                     edge.dataSourceType, edge.schedulingType, out, in);

Modified: pig/trunk/src/org/apache/pig/impl/builtin/FindQuantiles.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/builtin/FindQuantiles.java?rev=1613749&r1=1613748&r2=1613749&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/impl/builtin/FindQuantiles.java (original)
+++ pig/trunk/src/org/apache/pig/impl/builtin/FindQuantiles.java Sun Jul 27 04:48:18 2014
@@ -165,7 +165,6 @@ public class FindQuantiles extends EvalF
         // (numQuantiles, bag of samples) 
         // numQuantiles here is the reduce parallelism
         try{
-            Integer numQuantiles = this.numQuantiles;
             if (numQuantiles == null) {
                 numQuantiles = (Integer)in.get(0);
             }