You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by bi...@apache.org on 2014/02/16 04:39:09 UTC
git commit: TEZ-825. Fix incorrect inheritance method calls in
ThreeLevels and SixLevels failing dags. (Tassapol Athiapinya via bikas)
Repository: incubator-tez
Updated Branches:
refs/heads/master 2480c4e2b -> 59b9bbaba
TEZ-825. Fix incorrect inheritance method calls in ThreeLevels and SixLevels failing dags. (Tassapol Athiapinya via bikas)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/59b9bbab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/59b9bbab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/59b9bbab
Branch: refs/heads/master
Commit: 59b9bbaba4fd81ce2e10b8ba53c791f690819db6
Parents: 2480c4e
Author: Bikas Saha <bi...@apache.org>
Authored: Sat Feb 15 19:38:55 2014 -0800
Committer: Bikas Saha <bi...@apache.org>
Committed: Sat Feb 15 19:38:55 2014 -0800
----------------------------------------------------------------------
.../org/apache/tez/test/dag/SixLevelsFailingDAG.java | 11 +++++++++++
.../org/apache/tez/test/dag/ThreeLevelsFailingDAG.java | 13 ++++++++++++-
2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/59b9bbab/tez-tests/src/test/java/org/apache/tez/test/dag/SixLevelsFailingDAG.java
----------------------------------------------------------------------
diff --git a/tez-tests/src/test/java/org/apache/tez/test/dag/SixLevelsFailingDAG.java b/tez-tests/src/test/java/org/apache/tez/test/dag/SixLevelsFailingDAG.java
index f74d819..f6a9d88 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/dag/SixLevelsFailingDAG.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/dag/SixLevelsFailingDAG.java
@@ -18,6 +18,7 @@
package org.apache.tez.test.dag;
import org.apache.hadoop.conf.Configuration;
+import org.apache.tez.common.TezUtils;
import org.apache.tez.dag.api.DAG;
import org.apache.tez.dag.api.Vertex;
import org.apache.tez.dag.api.EdgeProperty.DataMovementType;
@@ -78,6 +79,16 @@ public class SixLevelsFailingDAG extends ThreeLevelsFailingDAG {
addEdge(l5v3, l6v1, DataMovementType.SCATTER_GATHER);
}
+ public static DAG createDAG(String name,
+ Configuration conf) throws Exception {
+ if (conf != null) {
+ payload = TezUtils.createUserPayloadFromConf(conf);
+ }
+ dag = new DAG(name);
+ addDAGVerticesAndEdges();
+ return dag;
+ }
+
public static DAG createDAG(Configuration conf) throws Exception {
return createDAG("SixLevelsFailingDAG", conf);
}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/59b9bbab/tez-tests/src/test/java/org/apache/tez/test/dag/ThreeLevelsFailingDAG.java
----------------------------------------------------------------------
diff --git a/tez-tests/src/test/java/org/apache/tez/test/dag/ThreeLevelsFailingDAG.java b/tez-tests/src/test/java/org/apache/tez/test/dag/ThreeLevelsFailingDAG.java
index 8062285..c740ec3 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/dag/ThreeLevelsFailingDAG.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/dag/ThreeLevelsFailingDAG.java
@@ -18,6 +18,7 @@
package org.apache.tez.test.dag;
import org.apache.hadoop.conf.Configuration;
+import org.apache.tez.common.TezUtils;
import org.apache.tez.dag.api.DAG;
import org.apache.tez.dag.api.Vertex;
import org.apache.tez.dag.api.EdgeProperty.DataMovementType;
@@ -58,7 +59,17 @@ public class ThreeLevelsFailingDAG extends TwoLevelsFailingDAG {
addEdge(l2v3, l3v2, DataMovementType.SCATTER_GATHER);
addEdge(l2v4, l3v2, DataMovementType.SCATTER_GATHER);
}
-
+
+ public static DAG createDAG(String name,
+ Configuration conf) throws Exception {
+ if (conf != null) {
+ payload = TezUtils.createUserPayloadFromConf(conf);
+ }
+ dag = new DAG(name);
+ addDAGVerticesAndEdges();
+ return dag;
+ }
+
public static DAG createDAG(Configuration conf) throws Exception {
return createDAG("ThreeLevelsFailingDAG", conf);
}