You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2013/09/26 20:30:41 UTC
git commit: TEZ-509. Fix failing test - TestDAGVerify. (sseth)
Updated Branches:
refs/heads/master ed3952ea0 -> 38350663c
TEZ-509. Fix failing test - TestDAGVerify. (sseth)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/38350663
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/38350663
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/38350663
Branch: refs/heads/master
Commit: 38350663c4f367efb46f7cb488cd85607d1dfc24
Parents: ed3952e
Author: Siddharth Seth <ss...@apache.org>
Authored: Thu Sep 26 11:30:25 2013 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Thu Sep 26 11:30:25 2013 -0700
----------------------------------------------------------------------
.../org/apache/tez/dag/api/TestDAGVerify.java | 69 +++++++-------------
1 file changed, 23 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/38350663/tez-api/src/test/java/org/apache/tez/dag/api/TestDAGVerify.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/dag/api/TestDAGVerify.java b/tez-api/src/test/java/org/apache/tez/dag/api/TestDAGVerify.java
index b33f3a6..229606f 100644
--- a/tez-api/src/test/java/org/apache/tez/dag/api/TestDAGVerify.java
+++ b/tez-api/src/test/java/org/apache/tez/dag/api/TestDAGVerify.java
@@ -37,7 +37,7 @@ public class TestDAGVerify {
// |
// v2
@Test
- public void testVerify1() {
+ public void testVerifyScatterGather() {
Vertex v1 = new Vertex("v1",
new ProcessorDescriptor(dummyProcessorClassName),
dummyTaskCount, dummyTaskResource);
@@ -56,8 +56,8 @@ public class TestDAGVerify {
dag.verify();
}
- @Test(expected = IllegalStateException.class)
- public void testVerify2() {
+ @Test
+ public void testVerifyOneToOne() {
Vertex v1 = new Vertex("v1",
new ProcessorDescriptor(dummyProcessorClassName),
dummyTaskCount, dummyTaskResource);
@@ -75,6 +75,26 @@ public class TestDAGVerify {
dag.addEdge(e1);
dag.verify();
}
+
+ @Test
+ public void testVerifyBroadcast() {
+ Vertex v1 = new Vertex("v1",
+ new ProcessorDescriptor(dummyProcessorClassName),
+ dummyTaskCount, dummyTaskResource);
+ Vertex v2 = new Vertex("v2",
+ new ProcessorDescriptor("MapProcessor"),
+ dummyTaskCount, dummyTaskResource);
+ Edge e1 = new Edge(v1, v2,
+ new EdgeProperty(DataMovementType.BROADCAST,
+ DataSourceType.PERSISTED, SchedulingType.SEQUENTIAL,
+ new OutputDescriptor(dummyOutputClassName),
+ new InputDescriptor(dummyInputClassName)));
+ DAG dag = new DAG("testDag");
+ dag.addVertex(v1);
+ dag.addVertex(v2);
+ dag.addEdge(e1);
+ dag.verify();
+ }
@Test(expected = IllegalStateException.class)
public void testVerify3() {
@@ -263,49 +283,6 @@ public class TestDAGVerify {
// | |
// v3
@Test
- public void BinaryInputDisallowed() {
- IllegalStateException ex=null;
- try {
- Vertex v1 = new Vertex("v1",
- new ProcessorDescriptor("MapProcessor"),
- dummyTaskCount, dummyTaskResource);
- Vertex v2 = new Vertex("v2",
- new ProcessorDescriptor("MapProcessor"),
- dummyTaskCount, dummyTaskResource);
- Vertex v3 = new Vertex("v3",
- new ProcessorDescriptor("ReduceProcessor"),
- dummyTaskCount, dummyTaskResource);
- Edge e1 = new Edge(v1, v3,
- new EdgeProperty(DataMovementType.ONE_TO_ONE,
- DataSourceType.PERSISTED, SchedulingType.SEQUENTIAL,
- new OutputDescriptor("dummy output class"),
- new InputDescriptor("dummy input class")));
- Edge e2 = new Edge(v2, v3,
- new EdgeProperty(DataMovementType.SCATTER_GATHER,
- DataSourceType.PERSISTED, SchedulingType.SEQUENTIAL,
- new OutputDescriptor("dummy output class"),
- new InputDescriptor("dummy input class")));
- DAG dag = new DAG("testDag");
- dag.addVertex(v1);
- dag.addVertex(v2);
- dag.addVertex(v3);
- dag.addEdge(e1);
- dag.addEdge(e2);
- dag.verify();
- }
- catch (IllegalStateException e){
- ex = e;
- }
- Assert.assertNotNull(ex);
- System.out.println(ex.getMessage());
- Assert.assertTrue(ex.getMessage().startsWith(
- "Unsupported connection pattern on edge"));
- }
-
- // v1 v2
- // | |
- // v3
- @Test
public void BinaryInputAllowed() {
Vertex v1 = new Vertex("v1",
new ProcessorDescriptor("MapProcessor"),