You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ro...@apache.org on 2014/07/17 23:37:34 UTC
svn commit: r1611482 - in /pig/trunk: ./
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/
src/org/apache/pig/backend/hadoop/executionengine/tez/
Author: rohini
Date: Thu Jul 17 21:37:34 2014
New Revision: 1611482
URL: http://svn.apache.org/r1611482
Log:
PIG-4056: Remove PhysicalOperator.setAlias (rohini)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/MultiQueryOptimizerTez.java
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1611482&r1=1611481&r2=1611482&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Jul 17 21:37:34 2014
@@ -42,6 +42,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-4056: Remove PhysicalOperator.setAlias (rohini)
+
PIG-4058: Use single config in Tez for input and output (rohini)
PIG-3886: UdfDistributedCache_1 fails in tez branch (cheolsoo)
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java?rev=1611482&r1=1611481&r2=1611482&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java Thu Jul 17 21:37:34 2014
@@ -183,8 +183,9 @@ public abstract class PhysicalOperator e
return (alias == null) ? "" : (alias + ": ");
}
- public void setAlias(String alias) {
- this.alias = alias;
+ public void copyAliasFrom(PhysicalOperator op) {
+ this.alias = op.alias;
+ this.originalLocations = op.originalLocations;
}
public void addOriginalLocation(String alias, SourceLocation sourceLocation) {
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/MultiQueryOptimizerTez.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/MultiQueryOptimizerTez.java?rev=1611482&r1=1611481&r2=1611482&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/MultiQueryOptimizerTez.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/MultiQueryOptimizerTez.java Thu Jul 17 21:37:34 2014
@@ -99,7 +99,7 @@ public class MultiQueryOptimizerTez exte
} else {
POValueOutputTez valueOutput = (POValueOutputTez)tezOp.plan.getLeaves().get(0);
POSplit split = new POSplit(OperatorKey.genOpKey(valueOutput.getOperatorKey().getScope()));
- split.setAlias(valueOutput.getAlias());
+ split.copyAliasFrom(valueOutput);
for (TezOperator splitee : splittees) {
PhysicalOperator spliteeRoot = splitee.plan.getRoots().get(0);
splitee.plan.remove(spliteeRoot);
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java?rev=1611482&r1=1611481&r2=1611482&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java Thu Jul 17 21:37:34 2014
@@ -626,7 +626,7 @@ public class TezCompiler extends PhyPlan
try {
POLocalRearrangeTez lr = localRearrangeFactory.create();
lr.setDistinct(true);
- lr.setAlias(op.getAlias());
+ lr.copyAliasFrom(op);
curTezOp.plan.addAsLeaf(lr);
TezOperator lastOp = curTezOp;
@@ -774,7 +774,7 @@ public class TezCompiler extends PhyPlan
// Need to add POValueOutputTez to the end of the last tezOp
POValueOutputTez output = new POValueOutputTez(OperatorKey.genOpKey(scope));
- output.setAlias(op.getAlias());
+ output.copyAliasFrom(op);
curTezOp.plan.addAsLeaf(output);
TezOperator prevOp = curTezOp;
@@ -791,13 +791,13 @@ public class TezCompiler extends PhyPlan
// Then add a POValueInputTez to the start of the new tezOp.
POValueInputTez input = new POValueInputTez(OperatorKey.genOpKey(scope));
- input.setAlias(op.getAlias());
+ input.copyAliasFrom(op);
input.setInputKey(prevOp.getOperatorKey().toString());
curTezOp.plan.addAsLeaf(input);
if (!pigContext.inIllustrator) {
POLimit limitCopy = new POLimit(OperatorKey.genOpKey(scope));
- limitCopy.setAlias(op.getAlias());
+ limitCopy.copyAliasFrom(op);
limitCopy.setLimit(op.getLimit());
limitCopy.setLimitPlan(op.getLimitPlan());
curTezOp.plan.addAsLeaf(limitCopy);
@@ -2026,7 +2026,7 @@ public class TezCompiler extends PhyPlan
// Equivalent of LimitAdjuster.java in MR
if (op.isLimited() && rp != 1) {
POValueOutputTez output = new POValueOutputTez(OperatorKey.genOpKey(scope));
- output.setAlias(op.getAlias());
+ output.copyAliasFrom(op);
sortOpers[1].plan.addAsLeaf(output);
TezOperator limitOper = getTezOp();
@@ -2053,7 +2053,7 @@ public class TezCompiler extends PhyPlan
// Then add a POValueInputTez to the start of the new tezOp followed by a LIMIT
POValueInputTez input = new POValueInputTez(OperatorKey.genOpKey(scope));
- input.setAlias(op.getAlias());
+ input.copyAliasFrom(op);
input.setInputKey(sortOpers[1].getOperatorKey().toString());
curTezOp.plan.addAsLeaf(input);
@@ -2083,7 +2083,7 @@ public class TezCompiler extends PhyPlan
splitOp.setSplitter(true);
phyToTezOpMap.put(op, splitOp);
output = new POValueOutputTez(OperatorKey.genOpKey(scope));
- output.setAlias(op.getAlias());
+ output.copyAliasFrom(op);
splitOp.plan.addAsLeaf(output);
}
curTezOp = getTezOp();
@@ -2095,7 +2095,7 @@ public class TezCompiler extends PhyPlan
TezCompilerUtil.configureValueOnlyTupleOutput(edge, DataMovementType.ONE_TO_ONE);
curTezOp.setRequestedParallelismByReference(splitOp);
POValueInputTez input = new POValueInputTez(OperatorKey.genOpKey(scope));
- input.setAlias(op.getAlias());
+ input.copyAliasFrom(op);
input.setInputKey(splitOp.getOperatorKey().toString());
curTezOp.plan.addAsLeaf(input);
} catch (Exception e) {
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=1611482&r1=1611481&r2=1611482&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 Thu Jul 17 21:37:34 2014
@@ -822,7 +822,7 @@ public class TezDagBuilder extends TezOp
POSimpleTezLoad tezLoad = new POSimpleTezLoad(new OperatorKey(
scope, nig.getNextNodeId(scope)), ld.getLFile());
tezLoad.setInputKey(ld.getOperatorKey().toString());
- tezLoad.setAlias(ld.getAlias());
+ tezLoad.copyAliasFrom(ld);
tezOp.plan.add(tezLoad);
for (PhysicalOperator sucs : ldSucs) {
tezOp.plan.connect(tezLoad, sucs);