tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject [2/2] git commit: TEZ-623. Vertices should be able to support multiple outputs. (hitesh)
Date Mon, 18 Nov 2013 23:16:12 GMT
TEZ-623. Vertices should be able to support multiple outputs. (hitesh)


Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/8f8b6601
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/8f8b6601
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/8f8b6601

Branch: refs/heads/master
Commit: 8f8b660124c0777e50f1130f949fd2e3f11d46aa
Parents: cf6e7de
Author: Hitesh Shah <hitesh@apache.org>
Authored: Mon Nov 18 15:15:51 2013 -0800
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Mon Nov 18 15:15:51 2013 -0800

----------------------------------------------------------------------
 tez-api/src/main/java/org/apache/tez/dag/api/DAG.java          | 6 ------
 .../src/test/java/org/apache/tez/dag/api/TestDAGVerify.java    | 6 ++----
 2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8f8b6601/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java b/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
index 5b62007..3d0a910 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
@@ -262,12 +262,6 @@ public class DAG { // FIXME rename to Topology
             "Unsupported scheduling type on edge. " + e);
         }
       }
-      for (AnnotatedVertex av : vertexMap.values()) {
-        if (av.outDegree > 1) {
-          throw new IllegalStateException("Vertex has outDegree>1: "
-            + av.v.getVertexName());
-        }
-      }
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8f8b6601/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 b8a5e84..a4fe4af 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
@@ -399,7 +399,7 @@ public class TestDAGVerify {
   //  v2  v3
   @Test
   public void BinaryOutput() {
-    IllegalStateException ex=null;
+    IllegalStateException ex = null;
     try {
       Vertex v1 = new Vertex("v1",
           new ProcessorDescriptor("MapProcessor"),
@@ -431,9 +431,7 @@ public class TestDAGVerify {
     catch (IllegalStateException e){
       ex = e;
     }
-    Assert.assertNotNull(ex);
-    System.out.println(ex.getMessage());
-    Assert.assertTrue(ex.getMessage().startsWith("Vertex has outDegree>1"));
+    Assert.assertNull(ex);
   }
 
   @Test


Mime
View raw message