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/04/03 23:41:35 UTC
svn commit: r1584411 - in
/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine:
mapReduceLayer/ physicalLayer/plans/ tez/ tez/operators/
Author: daijy
Date: Thu Apr 3 21:41:34 2014
New Revision: 1584411
URL: http://svn.apache.org/r1584411
Log:
PIG-3862: e2e test Rank_9 fail
Modified:
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POFRJoinTez.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POIdentityInOutTez.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTez.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POPartitionRearrangeTez.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POShuffleTezLoad.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POSimpleTezLoad.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POStoreTez.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueInputTez.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueOutputTez.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterStatsTez.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/PORankTez.java
pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POShuffledValueInputTez.java
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java Thu Apr 3 21:41:34 2014
@@ -72,6 +72,19 @@ import org.apache.pig.backend.hadoop.exe
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POStore;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POStream;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POUnion;
+import org.apache.pig.backend.hadoop.executionengine.tez.POFRJoinTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.POIdentityInOutTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.POLocalRearrangeTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.POPartitionRearrangeTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.POShuffleTezLoad;
+import org.apache.pig.backend.hadoop.executionengine.tez.POSimpleTezLoad;
+import org.apache.pig.backend.hadoop.executionengine.tez.POStoreTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.POValueInputTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.POValueOutputTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.operators.POCounterStatsTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.operators.POCounterTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.operators.PORankTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.operators.POShuffledValueInputTez;
import org.apache.pig.impl.plan.DependencyOrderWalker;
import org.apache.pig.impl.plan.VisitorException;
@@ -175,7 +188,7 @@ public class PhyPlanSetter extends PhyPl
@Override
public void visitRank(PORank rank) throws VisitorException {
-
+ rank.setParentPlan(parent);
}
@Override
@@ -365,4 +378,68 @@ public class PhyPlanSetter extends PhyPl
poissonSample.setParentPlan(parent);
}
+ @Override
+ public void visitValueInputTez(POValueInputTez valueInputTez) throws VisitorException {
+ valueInputTez.setParentPlan(parent);
+ }
+
+ @Override
+ public void visitValueOutputTez(POValueOutputTez valueOutputTez) throws VisitorException {
+ valueOutputTez.setParentPlan(parent);
+ }
+
+ @Override
+ public void visitCounterStatsTez(POCounterStatsTez counterStatsTez) throws VisitorException {
+ counterStatsTez.setParentPlan(parent);
+ }
+
+ @Override
+ public void visitFRJoinTez(POFRJoinTez frJoinTez) throws VisitorException {
+ frJoinTez.setParentPlan(parent);
+ }
+
+ @Override
+ public void visitIdentityInOutTez(POIdentityInOutTez identityInOutTez) throws VisitorException {
+ identityInOutTez.setParentPlan(parent);
+ }
+
+ @Override
+ public void visitRankTez(PORankTez rankTez) throws VisitorException {
+ rankTez.setParentPlan(parent);
+ }
+
+ @Override
+ public void visitShuffledValueInputTez(POShuffledValueInputTez shuffledValueInputTez) throws VisitorException {
+ shuffledValueInputTez.setParentPlan(parent);
+ }
+
+ @Override
+ public void visitShuffleTezLoad(POShuffleTezLoad shuffleTezLoad) throws VisitorException {
+ shuffleTezLoad.setParentPlan(parent);
+ }
+
+ @Override
+ public void visitSimpleTezLoad(POSimpleTezLoad simpleTezLoad) throws VisitorException {
+ simpleTezLoad.setParentPlan(parent);
+ }
+
+ @Override
+ public void visitCounterTez(POCounterTez counterStatsTez) throws VisitorException {
+ counterStatsTez.setParentPlan(parent);
+ }
+
+ @Override
+ public void visitPOLocalRearrangeTez(POLocalRearrangeTez localRearrangeTez) throws VisitorException {
+ localRearrangeTez.setParentPlan(parent);
+ }
+
+ @Override
+ public void visitPOPartitionRearrangeTez(POPartitionRearrangeTez partitionRearrangeTez) throws VisitorException {
+ partitionRearrangeTez.setParentPlan(parent);
+ }
+
+ @Override
+ public void visitPOStoreTez(POStoreTez storeTez) throws VisitorException {
+ storeTez.setParentPlan(parent);
+ }
}
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java Thu Apr 3 21:41:34 2014
@@ -73,6 +73,19 @@ import org.apache.pig.backend.hadoop.exe
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POStore;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POStream;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POUnion;
+import org.apache.pig.backend.hadoop.executionengine.tez.POFRJoinTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.POIdentityInOutTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.POLocalRearrangeTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.POPartitionRearrangeTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.POShuffleTezLoad;
+import org.apache.pig.backend.hadoop.executionengine.tez.POSimpleTezLoad;
+import org.apache.pig.backend.hadoop.executionengine.tez.POStoreTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.POValueInputTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.POValueOutputTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.operators.POCounterStatsTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.operators.POCounterTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.operators.PORankTez;
+import org.apache.pig.backend.hadoop.executionengine.tez.operators.POShuffledValueInputTez;
import org.apache.pig.impl.plan.PlanVisitor;
import org.apache.pig.impl.plan.PlanWalker;
import org.apache.pig.impl.plan.VisitorException;
@@ -358,4 +371,43 @@ public class PhyPlanVisitor extends Plan
public void visitPoissonSample(POPoissonSample poissonSample) throws VisitorException {
}
+
+ public void visitValueInputTez(POValueInputTez valueInputTez) throws VisitorException {
+ }
+
+ public void visitValueOutputTez(POValueOutputTez valueOutputTez) throws VisitorException {
+ }
+
+ public void visitCounterStatsTez(POCounterStatsTez counterStatsTez) throws VisitorException {
+ }
+
+ public void visitFRJoinTez(POFRJoinTez frJoinTez) throws VisitorException {
+ }
+
+ public void visitIdentityInOutTez(POIdentityInOutTez identityInOutTez) throws VisitorException {
+ }
+
+ public void visitRankTez(PORankTez rankTez) throws VisitorException {
+ }
+
+ public void visitShuffledValueInputTez(POShuffledValueInputTez shuffledValueInputTez) throws VisitorException {
+ }
+
+ public void visitShuffleTezLoad(POShuffleTezLoad shuffleTezLoad) throws VisitorException {
+ }
+
+ public void visitSimpleTezLoad(POSimpleTezLoad simpleTezLoad) throws VisitorException {
+ }
+
+ public void visitCounterTez(POCounterTez counterStatsTez) throws VisitorException {
+ }
+
+ public void visitPOLocalRearrangeTez(POLocalRearrangeTez localRearrangeTez) throws VisitorException {
+ }
+
+ public void visitPOPartitionRearrangeTez(POPartitionRearrangeTez partitionRearrangeTez) throws VisitorException {
+ }
+
+ public void visitPOStoreTez(POStoreTez storeTez) throws VisitorException {
+ }
}
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POFRJoinTez.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POFRJoinTez.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POFRJoinTez.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POFRJoinTez.java Thu Apr 3 21:41:34 2014
@@ -27,6 +27,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.pig.backend.executionengine.ExecException;
+import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POFRJoin;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POLocalRearrange;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POMergeJoin.TuplesToSchemaTupleList;
@@ -37,6 +38,7 @@ import org.apache.pig.data.Tuple;
import org.apache.pig.impl.io.NullableTuple;
import org.apache.pig.impl.io.PigNullableWritable;
import org.apache.pig.impl.logicalLayer.schema.Schema;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.tez.runtime.api.LogicalInput;
import org.apache.tez.runtime.library.api.KeyValueReader;
import org.apache.tez.runtime.library.input.ShuffledUnorderedKVInput;
@@ -62,6 +64,12 @@ public class POFRJoinTez extends POFRJoi
super(copy);
this.inputKeys = inputKeys;
}
+
+
+ @Override
+ public void visit(PhyPlanVisitor v) throws VisitorException {
+ v.visitFRJoinTez(this);
+ }
@Override
public String[] getTezInputs() {
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POIdentityInOutTez.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POIdentityInOutTez.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POIdentityInOutTez.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POIdentityInOutTez.java Thu Apr 3 21:41:34 2014
@@ -26,10 +26,12 @@ import org.apache.hadoop.classification.
import org.apache.hadoop.conf.Configuration;
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.Result;
+import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POLocalRearrange;
import org.apache.pig.impl.io.NullablePartitionWritable;
import org.apache.pig.impl.io.PigNullableWritable;
import org.apache.pig.impl.plan.OperatorKey;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.tez.runtime.api.LogicalInput;
import org.apache.tez.runtime.api.LogicalOutput;
import org.apache.tez.runtime.api.Reader;
@@ -57,6 +59,11 @@ public class POIdentityInOutTez extends
this.mKey = k;
}
+ @Override
+ public void visit(PhyPlanVisitor v) throws VisitorException {
+ v.visitIdentityInOutTez(this);
+ }
+
public void setInputKey(String inputKey) {
this.inputKey = inputKey;
}
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTez.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTez.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTez.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTez.java Thu Apr 3 21:41:34 2014
@@ -26,12 +26,14 @@ import org.apache.pig.backend.executione
import org.apache.pig.backend.hadoop.HDataType;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.POStatus;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.Result;
+import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POLocalRearrange;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.io.NullableTuple;
import org.apache.pig.impl.io.PigNullableWritable;
import org.apache.pig.impl.plan.NodeIdGenerator;
import org.apache.pig.impl.plan.OperatorKey;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.tez.runtime.api.LogicalOutput;
import org.apache.tez.runtime.library.api.KeyValueWriter;
import org.apache.tez.runtime.library.output.OnFileSortedOutput;
@@ -67,6 +69,11 @@ public class POLocalRearrangeTez extends
}
}
+ @Override
+ public void visit(PhyPlanVisitor v) throws VisitorException {
+ v.visitPOLocalRearrangeTez(this);
+ }
+
public String getOutputKey() {
return outputKey;
}
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POPartitionRearrangeTez.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POPartitionRearrangeTez.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POPartitionRearrangeTez.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POPartitionRearrangeTez.java Thu Apr 3 21:41:34 2014
@@ -30,6 +30,7 @@ import org.apache.pig.backend.hadoop.HDa
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.POStatus;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.Result;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.expressionOperators.ExpressionOperator;
+import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
import org.apache.pig.data.BagFactory;
import org.apache.pig.data.DataBag;
@@ -41,6 +42,7 @@ import org.apache.pig.impl.io.NullablePa
import org.apache.pig.impl.io.NullableTuple;
import org.apache.pig.impl.io.PigNullableWritable;
import org.apache.pig.impl.plan.OperatorKey;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.pig.impl.util.Pair;
import org.python.google.common.collect.Lists;
@@ -74,6 +76,11 @@ public class POPartitionRearrangeTez ext
}
@Override
+ public void visit(PhyPlanVisitor v) throws VisitorException {
+ v.visitPOPartitionRearrangeTez(this);
+ }
+
+ @Override
public String name() {
return getAliasString() + "Partition Rearrange" + "["
+ DataType.findTypeName(resultType) + "]" + "{"
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POShuffleTezLoad.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POShuffleTezLoad.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POShuffleTezLoad.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POShuffleTezLoad.java Thu Apr 3 21:41:34 2014
@@ -30,6 +30,7 @@ import org.apache.pig.backend.executione
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.JobControlCompiler;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.POStatus;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.Result;
+import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POPackage;
import org.apache.pig.data.AccumulativeBag;
import org.apache.pig.data.DataBag;
@@ -37,6 +38,7 @@ import org.apache.pig.data.InternalCache
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.io.NullableTuple;
import org.apache.pig.impl.io.PigNullableWritable;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.tez.runtime.api.LogicalInput;
import org.apache.tez.runtime.library.api.KeyValuesReader;
import org.apache.tez.runtime.library.common.ConfigUtils;
@@ -61,6 +63,12 @@ public class POShuffleTezLoad extends PO
super(pack);
}
+
+ @Override
+ public void visit(PhyPlanVisitor v) throws VisitorException {
+ v.visitShuffleTezLoad(this);
+ }
+
@Override
public String[] getTezInputs() {
return inputKeys.toArray(new String[inputKeys.size()]);
@@ -80,7 +88,7 @@ public class POShuffleTezLoad extends PO
@Override
public void attachInputs(Map<String, LogicalInput> inputs, Configuration conf)
throws ExecException {
-
+ this.conf = conf;
comparator = (WritableComparator) ConfigUtils.getInputKeySecondaryGroupingComparator(conf);
try {
for (String key : inputKeys) {
@@ -107,7 +115,6 @@ public class POShuffleTezLoad extends PO
} catch (Exception e) {
throw new ExecException(e);
}
- this.conf = conf;
}
@Override
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POSimpleTezLoad.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POSimpleTezLoad.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POSimpleTezLoad.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POSimpleTezLoad.java Thu Apr 3 21:41:34 2014
@@ -27,9 +27,11 @@ import org.apache.pig.backend.executione
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.JobControlCompiler;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.POStatus;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.Result;
+import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POLoad;
import org.apache.pig.data.Tuple;
import org.apache.pig.impl.plan.OperatorKey;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.tez.mapreduce.input.MRInput;
import org.apache.tez.runtime.api.LogicalInput;
import org.apache.tez.runtime.library.api.KeyValueReader;
@@ -50,6 +52,11 @@ public class POSimpleTezLoad extends POL
}
@Override
+ public void visit(PhyPlanVisitor v) throws VisitorException {
+ v.visitSimpleTezLoad(this);
+ }
+
+ @Override
public String[] getTezInputs() {
return new String[] { inputKey };
}
@@ -69,6 +76,7 @@ public class POSimpleTezLoad extends POL
public void attachInputs(Map<String, LogicalInput> inputs,
Configuration conf)
throws ExecException {
+ this.conf = conf;
LogicalInput logInput = inputs.get(inputKey);
if (logInput == null || !(logInput instanceof MRInput)) {
throw new ExecException("POSimpleTezLoad only accepts MRInputs");
@@ -79,7 +87,6 @@ public class POSimpleTezLoad extends POL
} catch (IOException e) {
throw new ExecException(e);
}
- this.conf = conf;
}
/**
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POStoreTez.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POStoreTez.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POStoreTez.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POStoreTez.java Thu Apr 3 21:41:34 2014
@@ -25,8 +25,10 @@ import org.apache.hadoop.conf.Configurat
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.POStatus;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.Result;
+import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.relationalOperators.POStore;
import org.apache.pig.impl.plan.OperatorKey;
+import org.apache.pig.impl.plan.VisitorException;
import org.apache.tez.mapreduce.output.MROutput;
import org.apache.tez.runtime.api.LogicalOutput;
import org.apache.tez.runtime.library.api.KeyValueWriter;
@@ -51,6 +53,11 @@ public class POStoreTez extends POStore
this.outputKey = copy.getOperatorKey().toString();
}
+ @Override
+ public void visit(PhyPlanVisitor v) throws VisitorException {
+ v.visitPOStoreTez(this);
+ }
+
public String getOutputKey() {
return outputKey;
}
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueInputTez.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueInputTez.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueInputTez.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueInputTez.java Thu Apr 3 21:41:34 2014
@@ -78,6 +78,7 @@ public class POValueInputTez extends Phy
public void attachInputs(Map<String, LogicalInput> inputs,
Configuration conf)
throws ExecException {
+ this.conf = conf;
LogicalInput input = inputs.get(inputKey);
if (input == null) {
throw new ExecException("Input from vertex " + inputKey + " is missing");
@@ -88,7 +89,6 @@ public class POValueInputTez extends Phy
} catch (Exception e) {
throw new ExecException(e);
}
- this.conf = conf;
}
@Override
@@ -128,7 +128,7 @@ public class POValueInputTez extends Phy
@Override
public void visit(PhyPlanVisitor v) throws VisitorException {
- v.visit(this);
+ v.visitValueInputTez(this);
}
@Override
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueOutputTez.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueOutputTez.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueOutputTez.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueOutputTez.java Thu Apr 3 21:41:34 2014
@@ -131,7 +131,7 @@ public class POValueOutputTez extends Ph
@Override
public void visit(PhyPlanVisitor v) throws VisitorException {
- v.visit(this);
+ v.visitValueOutputTez(this);
}
@Override
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterStatsTez.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterStatsTez.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterStatsTez.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterStatsTez.java Thu Apr 3 21:41:34 2014
@@ -174,7 +174,7 @@ public class POCounterStatsTez extends P
@Override
public void visit(PhyPlanVisitor v) throws VisitorException {
- v.visit(this);
+ v.visitCounterStatsTez(this);
}
@Override
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java Thu Apr 3 21:41:34 2014
@@ -153,7 +153,7 @@ public class POCounterTez extends POCoun
@Override
public void visit(PhyPlanVisitor v) throws VisitorException {
super.visit(v);
- v.visit(this);
+ v.visitCounterTez(this);
}
@Override
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/PORankTez.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/PORankTez.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/PORankTez.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/PORankTez.java Thu Apr 3 21:41:34 2014
@@ -91,6 +91,7 @@ public class PORankTez extends PORank im
@Override
public void attachInputs(Map<String, LogicalInput> inputs,
Configuration conf) throws ExecException {
+ this.conf = conf;
LogicalInput input = inputs.get(tuplesInputKey);
if (input == null) {
throw new ExecException("Input from vertex " + tuplesInputKey + " is missing");
@@ -128,7 +129,6 @@ public class PORankTez extends PORank im
} catch (Exception e) {
throw new ExecException(e);
}
- this.conf = conf;
}
@Override
@@ -164,7 +164,7 @@ public class PORankTez extends PORank im
@Override
public void visit(PhyPlanVisitor v) throws VisitorException {
super.visit(v);
- v.visit(this);
+ v.visitRankTez(this);
}
@Override
Modified: pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POShuffledValueInputTez.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POShuffledValueInputTez.java?rev=1584411&r1=1584410&r2=1584411&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POShuffledValueInputTez.java (original)
+++ pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POShuffledValueInputTez.java Thu Apr 3 21:41:34 2014
@@ -83,6 +83,7 @@ public class POShuffledValueInputTez ext
@Override
public void attachInputs(Map<String, LogicalInput> inputs,
Configuration conf) throws ExecException {
+ this.conf = conf;
List<KeyValuesReader> readersList = new ArrayList<KeyValuesReader>();
try {
for (String inputKey : inputKeys) {
@@ -103,7 +104,6 @@ public class POShuffledValueInputTez ext
} catch (Exception e) {
throw new ExecException(e);
}
- this.conf = conf;
}
@Override
@@ -154,7 +154,7 @@ public class POShuffledValueInputTez ext
@Override
public void visit(PhyPlanVisitor v) throws VisitorException {
- v.visit(this);
+ v.visitShuffledValueInputTez(this);
}
@Override