svn commit: r1574170 - in /pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez: TezCompiler.java TezOperator.java

[ch...@apache.org]

Author: cheolsoo
Date: Tue Mar  4 18:12:29 2014
New Revision: 1574170

URL: http://svn.apache.org/r1574170
Log:
PIG-3795: Parallelism specified by user is not honored if default parallelism
is set to a higher value (cheolsoo)

Modified:
    pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java
    pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/TezOperator.java

Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java?rev=1574170&r1=1574169&r2=1574170&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java Tue Mar  4 18:12:29 2014
@@ -388,9 +388,6 @@ public class TezCompiler extends PhyPlan
 
         // Now we have the inputs compiled. Do something with the input oper op.
         op.visit(this);
-        if (op.getRequestedParallelism() > curTezOp.getRequestedParallelism()) {
-            curTezOp.setRequestedParallelism(op.getRequestedParallelism());
-        }
         compiledInputs = prevCompInp;
     }
 
@@ -811,6 +808,7 @@ public class TezCompiler extends PhyPlan
         try {
             blocking();
             TezCompilerUtil.setCustomPartitioner(op.getCustomPartitioner(), curTezOp);
+            curTezOp.setRequestedParallelism(op.getRequestedParallelism());
             phyToTezOpMap.put(op, curTezOp);
         } catch (Exception e) {
             int errCode = 2034;

Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/TezOperator.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/TezOperator.java?rev=1574170&r1=1574169&r2=1574170&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/TezOperator.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/TezOperator.java Tue Mar  4 18:12:29 2014
@@ -49,8 +49,6 @@ public class TezOperator extends Operato
     public Set<String> UDFs;
     public Set<PhysicalOperator> scalars;
 
-    // TODO: We need to specify parallelism per vertex in Tez. For now, we set
-    // them all to 1.
     // Use AtomicInteger for access by reference and being able to reset in
     // TezDAGBuilder based on number of input splits.
     // We just need mutability and not concurrency