tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject git commit: TEZ-1170 addendum to remove unnecessary transitions. Simplify Vertex Initializing transition (bikas)
Date Sun, 06 Jul 2014 21:11:42 GMT
Repository: incubator-tez
Updated Branches:
  refs/heads/master 6bb06d067 -> 1aa98989b


TEZ-1170 addendum to remove unnecessary transitions. Simplify Vertex Initializing transition
(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/1aa98989
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/1aa98989
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/1aa98989

Branch: refs/heads/master
Commit: 1aa98989b1a1a92df024241bac5163e2a1897780
Parents: 6bb06d0
Author: Bikas Saha <bikas@apache.org>
Authored: Sun Jul 6 14:11:31 2014 -0700
Committer: Bikas Saha <bikas@apache.org>
Committed: Sun Jul 6 14:11:31 2014 -0700

----------------------------------------------------------------------
 .../apache/tez/dag/app/dag/impl/VertexImpl.java | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/1aa98989/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
index 42d010d..4204c0a 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
@@ -409,10 +409,6 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
               EnumSet.of(VertexState.TERMINATING, VertexState.KILLED, VertexState.FAILED),
               VertexEventType.V_TASK_COMPLETED,
               new TaskCompletedTransition())
-          .addTransition(VertexState.TERMINATING,
-              EnumSet.of(VertexState.TERMINATING),
-              VertexEventType.V_ROOT_INPUT_INITIALIZED,
-              new RootInputInitializedTransition())
           .addTransition(
               VertexState.TERMINATING,
               VertexState.ERROR, VertexEventType.V_INTERNAL_ERROR,
@@ -421,6 +417,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
           .addTransition(VertexState.TERMINATING, VertexState.TERMINATING,
               EnumSet.of(VertexEventType.V_TERMINATE,
                   VertexEventType.V_SOURCE_VERTEX_STARTED,
+                  VertexEventType.V_ROOT_INPUT_INITIALIZED,
                   VertexEventType.V_NULL_EDGE_INITIALIZED,
                   VertexEventType.V_ROUTE_EVENT,
                   VertexEventType.V_SOURCE_TASK_ATTEMPT_COMPLETED,
@@ -465,10 +462,6 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
               VertexState.FAILED,
               VertexState.ERROR, VertexEventType.V_INTERNAL_ERROR,
               INTERNAL_ERROR_TRANSITION)
-          .addTransition(VertexState.FAILED,
-              EnumSet.of(VertexState.FAILED),
-              VertexEventType.V_ROOT_INPUT_INITIALIZED,
-              new RootInputInitializedTransition())
           // Ignore-able events
           .addTransition(VertexState.FAILED, VertexState.FAILED,
               EnumSet.of(VertexEventType.V_TERMINATE,
@@ -479,6 +472,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
                   VertexEventType.V_TASK_ATTEMPT_COMPLETED,
                   VertexEventType.V_TASK_COMPLETED,
                   VertexEventType.V_ONE_TO_ONE_SOURCE_SPLIT,
+                  VertexEventType.V_ROOT_INPUT_INITIALIZED,
                   VertexEventType.V_SOURCE_TASK_ATTEMPT_COMPLETED,
                   VertexEventType.V_NULL_EDGE_INITIALIZED,
                   VertexEventType.V_ROOT_INPUT_FAILED,
@@ -489,10 +483,6 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
               VertexState.KILLED,
               VertexState.ERROR, VertexEventType.V_INTERNAL_ERROR,
               INTERNAL_ERROR_TRANSITION)
-          .addTransition(VertexState.KILLED,
-              EnumSet.of(VertexState.KILLED),
-              VertexEventType.V_ROOT_INPUT_INITIALIZED,
-              new RootInputInitializedTransition())
           // Ignore-able events
           .addTransition(VertexState.KILLED, VertexState.KILLED,
               EnumSet.of(VertexEventType.V_TERMINATE,
@@ -505,15 +495,12 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
                   VertexEventType.V_ONE_TO_ONE_SOURCE_SPLIT,
                   VertexEventType.V_SOURCE_TASK_ATTEMPT_COMPLETED,
                   VertexEventType.V_TASK_COMPLETED,
+                  VertexEventType.V_ROOT_INPUT_INITIALIZED,
                   VertexEventType.V_NULL_EDGE_INITIALIZED,
                   VertexEventType.V_ROOT_INPUT_FAILED,
                   VertexEventType.V_SOURCE_VERTEX_RECOVERED))
 
           // No transitions from INTERNAL_ERROR state. Ignore all.
-          .addTransition(VertexState.ERROR,
-              EnumSet.of(VertexState.ERROR),
-              VertexEventType.V_ROOT_INPUT_INITIALIZED,
-              new RootInputInitializedTransition())
           .addTransition(
               VertexState.ERROR,
               VertexState.ERROR,
@@ -528,6 +515,7 @@ public class VertexImpl implements org.apache.tez.dag.app.dag.Vertex,
                   VertexEventType.V_SOURCE_TASK_ATTEMPT_COMPLETED,
                   VertexEventType.V_TASK_RESCHEDULED,
                   VertexEventType.V_INTERNAL_ERROR,
+                  VertexEventType.V_ROOT_INPUT_INITIALIZED,
                   VertexEventType.V_NULL_EDGE_INITIALIZED,
                   VertexEventType.V_ROOT_INPUT_FAILED,
                   VertexEventType.V_SOURCE_VERTEX_RECOVERED))


Mime
View raw message