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/05 00:39:05 UTC
svn commit: r1584932 - in
/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine:
mapReduceLayer/ tez/ tez/operators/
Author: daijy
Date: Fri Apr 4 22:39:05 2014
New Revision: 1584932
URL: http://svn.apache.org/r1584932
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/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/POValueInputTez.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=1584932&r1=1584931&r2=1584932&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 Fri Apr 4 22:39:05 2014
@@ -87,6 +87,11 @@ public class PhyPlanSetter extends PhyPl
super(plan, new DependencyOrderWalker<PhysicalOperator, PhysicalPlan>(plan));
parent = plan;
}
+
+ @Override
+ public void visit(PhysicalOperator op) {
+ op.setParentPlan(parent);
+ }
@Override
public void visitLoad(POLoad ld) throws VisitorException{
@@ -175,7 +180,7 @@ public class PhyPlanSetter extends PhyPl
@Override
public void visitRank(PORank rank) throws VisitorException {
-
+ rank.setParentPlan(parent);
}
@Override
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=1584932&r1=1584931&r2=1584932&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 Fri Apr 4 22:39:05 2014
@@ -80,7 +80,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 +107,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=1584932&r1=1584931&r2=1584932&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 Fri Apr 4 22:39:05 2014
@@ -69,6 +69,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 +80,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/POValueInputTez.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueInputTez.java?rev=1584932&r1=1584931&r2=1584932&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 Fri Apr 4 22:39:05 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
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=1584932&r1=1584931&r2=1584932&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 Fri Apr 4 22:39:05 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
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=1584932&r1=1584931&r2=1584932&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 Fri Apr 4 22:39:05 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