tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject [3/5] TEZ-1237. Consolidate naming of API classes (bikas)
Date Mon, 11 Aug 2014 17:59:08 GMT
http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestRootInputVertexManager.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestRootInputVertexManager.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestRootInputVertexManager.java
index e55351e..b7907d6 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestRootInputVertexManager.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestRootInputVertexManager.java
@@ -30,8 +30,8 @@ import java.util.List;
 import org.apache.tez.dag.api.InputDescriptor;
 import org.apache.tez.dag.api.VertexManagerPluginContext;
 import org.apache.tez.runtime.api.Event;
-import org.apache.tez.runtime.api.events.RootInputConfigureVertexTasksEvent;
-import org.apache.tez.runtime.api.events.RootInputDataInformationEvent;
+import org.apache.tez.runtime.api.events.InputConfigureVertexTasksEvent;
+import org.apache.tez.runtime.api.events.InputDataInformationEvent;
 import org.junit.Test;
 
 public class TestRootInputVertexManager {
@@ -48,14 +48,14 @@ public class TestRootInputVertexManager {
 
     InputDescriptor id1 = mock(InputDescriptor.class);
     List<Event> events1 = new LinkedList<Event>();
-    RootInputDataInformationEvent diEvent11 = new RootInputDataInformationEvent(0, null);
+    InputDataInformationEvent diEvent11 = new InputDataInformationEvent(0, null);
     events1.add(diEvent11);
     rootInputVertexManager.onRootVertexInitialized("input1", id1, events1);
     // All good so far, single input only.
 
     InputDescriptor id2 = mock(InputDescriptor.class);
     List<Event> events2 = new LinkedList<Event>();
-    RootInputDataInformationEvent diEvent21 = new RootInputDataInformationEvent(0, null);
+    InputDataInformationEvent diEvent21 = new InputDataInformationEvent(0, null);
     events2.add(diEvent21);
     try {
       // Should fail due to second input
@@ -79,7 +79,7 @@ public class TestRootInputVertexManager {
 
     InputDescriptor id1 = mock(InputDescriptor.class);
     List<Event> events1 = new LinkedList<Event>();
-    RootInputConfigureVertexTasksEvent diEvent11 = new RootInputConfigureVertexTasksEvent(1, null,
+    InputConfigureVertexTasksEvent diEvent11 = new InputConfigureVertexTasksEvent(1, null,
         null);
     events1.add(diEvent11);
     rootInputVertexManager.onRootVertexInitialized("input1", id1, events1);
@@ -87,7 +87,7 @@ public class TestRootInputVertexManager {
 
     InputDescriptor id2 = mock(InputDescriptor.class);
     List<Event> events2 = new LinkedList<Event>();
-    RootInputConfigureVertexTasksEvent diEvent21 = new RootInputConfigureVertexTasksEvent(1, null,
+    InputConfigureVertexTasksEvent diEvent21 = new InputConfigureVertexTasksEvent(1, null,
         null);
     events2.add(diEvent21);
     try {

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
index f2adae8..4fec387 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
@@ -62,8 +62,8 @@ import org.apache.hadoop.yarn.event.EventHandler;
 import org.apache.hadoop.yarn.util.Clock;
 import org.apache.hadoop.yarn.util.SystemClock;
 import org.apache.tez.dag.api.DagTypeConverters;
-import org.apache.tez.dag.api.EdgeManager;
-import org.apache.tez.dag.api.EdgeManagerDescriptor;
+import org.apache.tez.dag.api.EdgeManagerPlugin;
+import org.apache.tez.dag.api.EdgeManagerPluginDescriptor;
 import org.apache.tez.dag.api.EdgeProperty;
 import org.apache.tez.dag.api.EdgeProperty.DataSourceType;
 import org.apache.tez.dag.api.EdgeProperty.SchedulingType;
@@ -134,15 +134,15 @@ import org.apache.tez.dag.utils.JavaProfilerOptions;
 import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.OutputCommitter;
 import org.apache.tez.runtime.api.OutputCommitterContext;
-import org.apache.tez.runtime.api.RootInputSpecUpdate;
-import org.apache.tez.runtime.api.TezRootInputInitializer;
-import org.apache.tez.runtime.api.TezRootInputInitializerContext;
+import org.apache.tez.runtime.api.InputSpecUpdate;
+import org.apache.tez.runtime.api.InputInitializer;
+import org.apache.tez.runtime.api.InputInitializerContext;
 import org.apache.tez.runtime.api.events.CompositeDataMovementEvent;
 import org.apache.tez.runtime.api.events.DataMovementEvent;
-import org.apache.tez.runtime.api.events.RootInputConfigureVertexTasksEvent;
-import org.apache.tez.runtime.api.events.RootInputDataInformationEvent;
-import org.apache.tez.runtime.api.events.RootInputInitializerEvent;
-import org.apache.tez.runtime.api.events.RootInputUpdatePayloadEvent;
+import org.apache.tez.runtime.api.events.InputConfigureVertexTasksEvent;
+import org.apache.tez.runtime.api.events.InputDataInformationEvent;
+import org.apache.tez.runtime.api.events.InputInitializerEvent;
+import org.apache.tez.runtime.api.events.InputUpdatePayloadEvent;
 import org.apache.tez.runtime.api.events.VertexManagerEvent;
 import org.apache.tez.test.EdgeManagerForTest;
 import org.apache.tez.test.VertexManagerPluginForTest;
@@ -169,7 +169,7 @@ public class TestVertexImpl {
   private static final Log LOG = LogFactory.getLog(TestVertexImpl.class);
 
   private boolean useCustomInitializer = false;
-  private TezRootInputInitializer customInitializer = null;
+  private InputInitializer customInitializer = null;
   
   private TezDAGID dagId;
   private ApplicationAttemptId appAttemptId;
@@ -1859,10 +1859,10 @@ public class TestVertexImpl {
     VertexImpl v1 = vertices.get("vertex1");
     startVertex(vertices.get("vertex2"));
     startVertex(v1);
-    EdgeManagerDescriptor mockEdgeManagerDescriptor =
-        new EdgeManagerDescriptor(EdgeManagerForTest.class.getName());
+    EdgeManagerPluginDescriptor mockEdgeManagerDescriptor =
+        new EdgeManagerPluginDescriptor(EdgeManagerForTest.class.getName());
 
-    Map<String, EdgeManagerDescriptor> edgeManagerDescriptors =
+    Map<String, EdgeManagerPluginDescriptor> edgeManagerDescriptors =
         Collections.singletonMap(
        v1.getName(), mockEdgeManagerDescriptor);
     Assert.assertTrue(v3.setParallelism(1, null, edgeManagerDescriptors, null));
@@ -1916,28 +1916,28 @@ public class TestVertexImpl {
   public void testSetCustomEdgeManager() throws UnsupportedEncodingException {
     initAllVertices(VertexState.INITED);
     Edge edge = edges.get("e4");
-    EdgeManager em = edge.getEdgeManager();
+    EdgeManagerPlugin em = edge.getEdgeManager();
     EdgeManagerForTest originalEm = (EdgeManagerForTest) em;
     Assert.assertTrue(Arrays.equals(edgePayload, originalEm.getEdgeManagerContext()
         .getUserPayload()));
 
     byte[] userPayload = new String("foo").getBytes();
-    EdgeManagerDescriptor edgeManagerDescriptor =
-        new EdgeManagerDescriptor(EdgeManagerForTest.class.getName());
+    EdgeManagerPluginDescriptor edgeManagerDescriptor =
+        new EdgeManagerPluginDescriptor(EdgeManagerForTest.class.getName());
     edgeManagerDescriptor.setUserPayload(userPayload);
 
     Vertex v3 = vertices.get("vertex3");
     Vertex v5 = vertices.get("vertex5"); // Vertex5 linked to v3 (v3 src, v5
                                          // dest)
 
-    Map<String, EdgeManagerDescriptor> edgeManagerDescriptors =
+    Map<String, EdgeManagerPluginDescriptor> edgeManagerDescriptors =
         Collections.singletonMap(v3.getName(), edgeManagerDescriptor);
     Assert.assertTrue(v5.setParallelism(v5.getTotalTasks() - 1, null,
         edgeManagerDescriptors, null)); // Must decrease.
 
     VertexImpl v5Impl = (VertexImpl) v5;
 
-    EdgeManager modifiedEdgeManager = v5Impl.sourceVertices.get(v3)
+    EdgeManagerPlugin modifiedEdgeManager = v5Impl.sourceVertices.get(v3)
         .getEdgeManager();
     Assert.assertNotNull(modifiedEdgeManager);
     Assert.assertTrue(modifiedEdgeManager instanceof EdgeManagerForTest);
@@ -2635,8 +2635,8 @@ public class TestVertexImpl {
     
     // setting the edge manager should vertex1 should not INIT/START it since
     // input initialization is not complete. v5 should be inited
-    EdgeManagerDescriptor mockEdgeManagerDescriptor =
-        new EdgeManagerDescriptor(EdgeManagerForTest.class.getName());
+    EdgeManagerPluginDescriptor mockEdgeManagerDescriptor =
+        new EdgeManagerPluginDescriptor(EdgeManagerForTest.class.getName());
     Edge e = v5.sourceVertices.get(v1);
     Assert.assertNull(e.getEdgeManager());
     e.setCustomEdgeManager(mockEdgeManagerDescriptor);
@@ -2677,7 +2677,7 @@ public class TestVertexImpl {
     Assert.assertEquals(VertexState.INITIALIZING, vertices.get("vertex4").getState());
     
     mockEdgeManagerDescriptor =
-        new EdgeManagerDescriptor(EdgeManagerForTest.class.getName());
+        new EdgeManagerPluginDescriptor(EdgeManagerForTest.class.getName());
     e = vertices.get("vertex6").sourceVertices.get(vertices.get("vertex4"));
     Assert.assertNull(e.getEdgeManager());
     e.setCustomEdgeManager(mockEdgeManagerDescriptor);
@@ -2843,7 +2843,7 @@ public class TestVertexImpl {
     Assert.assertFalse(initializer.initComplete.get());
 
     // Signal the initializer by sending an event - via vertex1
-    RootInputInitializerEvent event = new RootInputInitializerEvent("vertex2", "input1", null, 0);
+    InputInitializerEvent event = new InputInitializerEvent("vertex2", "input1", null, 0);
     TezEvent tezEvent = new TezEvent(event,
         new EventMetaData(EventProducerConsumerType.OUTPUT, "vertex1", null, null));
 
@@ -2910,7 +2910,7 @@ public class TestVertexImpl {
         new VertexManagerEvent("vertex2", new byte[0]), new EventMetaData(
             EventProducerConsumerType.PROCESSOR, "vertex1", "vertex2",
             ta0_t0_v1)));
-    events.add(new TezEvent(new RootInputDataInformationEvent(0, new byte[0]),
+    events.add(new TezEvent(new InputDataInformationEvent(0, new byte[0]),
         new EventMetaData(EventProducerConsumerType.INPUT, "vertex2",
             "NULL_VERTEX", null)));
     dispatcher.getEventHandler().handle(
@@ -2963,8 +2963,8 @@ public class TestVertexImpl {
     Assert.assertEquals(true, initializerManager1.hasShutDown);
     Assert.assertEquals(2, v1.getTotalTasks());
     Assert.assertEquals(payload, v1.getInputSpecList(0).get(0).getInputDescriptor().getUserPayload());
-    EdgeManagerDescriptor mockEdgeManagerDescriptor =
-        new EdgeManagerDescriptor(EdgeManagerForTest.class.getName());
+    EdgeManagerPluginDescriptor mockEdgeManagerDescriptor =
+        new EdgeManagerPluginDescriptor(EdgeManagerForTest.class.getName());
     Edge e = v2.sourceVertices.get(v1);
     Assert.assertNull(e.getEdgeManager());
     e.setCustomEdgeManager(mockEdgeManagerDescriptor);
@@ -3076,7 +3076,7 @@ public class TestVertexImpl {
   private static class VertexImplWithRunningInputInitializer extends VertexImpl {
 
     private RootInputInitializerManagerWithRunningInitializer rootInputInitializerManager;
-    private final TezRootInputInitializer presetInitializer;
+    private final InputInitializer presetInitializer;
 
     public VertexImplWithRunningInputInitializer(TezVertexID vertexId,
                                                  VertexPlan vertexPlan, String vertexName,
@@ -3087,7 +3087,7 @@ public class TestVertexImpl {
                                                  AppContext appContext,
                                                  VertexLocationHint vertexLocationHint,
                                                  DrainDispatcher dispatcher,
-                                                 TezRootInputInitializer presetInitializer) {
+                                                 InputInitializer presetInitializer) {
       super(vertexId, vertexPlan, vertexName, conf, eventHandler,
           taskAttemptListener, clock, thh, true,
           appContext, vertexLocationHint, null, javaProfilerOptions);
@@ -3155,10 +3155,10 @@ public class TestVertexImpl {
   private static class RootInputInitializerManagerWithRunningInitializer
       extends RootInputInitializerManager {
 
-    private final TezRootInputInitializer presetInitializer;
+    private final InputInitializer presetInitializer;
 
     public RootInputInitializerManagerWithRunningInitializer(Vertex vertex, AppContext appContext,
-                                                             TezRootInputInitializer presetInitializer) throws
+                                                             InputInitializer presetInitializer) throws
         IOException {
       super(vertex, appContext, UserGroupInformation.getCurrentUser());
       this.presetInitializer = presetInitializer;
@@ -3166,9 +3166,9 @@ public class TestVertexImpl {
 
 
     @Override
-    protected TezRootInputInitializer createInitializer(
+    protected InputInitializer createInitializer(
         RootInputLeafOutput<InputDescriptor, InputInitializerDescriptor> input,
-        TezRootInputInitializerContext context) {
+        InputInitializerContext context) {
       return presetInitializer;
     }
   }
@@ -3200,11 +3200,11 @@ public class TestVertexImpl {
     }
 
     @Override
-    protected TezRootInputInitializer createInitializer(
+    protected InputInitializer createInitializer(
         RootInputLeafOutput<InputDescriptor, InputInitializerDescriptor> input,
-        TezRootInputInitializerContext context) {
+        InputInitializerContext context) {
 
-      return new TezRootInputInitializer(context) {
+      return new InputInitializer(context) {
         @Override
         public List<Event> initialize() throws
             Exception {
@@ -3212,7 +3212,7 @@ public class TestVertexImpl {
         }
 
         @Override
-        public void handleInputInitializerEvent(List<RootInputInitializerEvent> events) throws
+        public void handleInputInitializerEvent(List<InputInitializerEvent> events) throws
             Exception {
         }
       };
@@ -3239,7 +3239,7 @@ public class TestVertexImpl {
 
     public void completeInputDistribution(byte[] payload) {
       List<Event> events = Lists.newArrayListWithCapacity(1);
-      RootInputUpdatePayloadEvent event = new RootInputUpdatePayloadEvent(payload);
+      InputUpdatePayloadEvent event = new InputUpdatePayloadEvent(payload);
       events.add(event);
       eventHandler.handle(new VertexEventRootInputInitialized(vertexID, inputs
           .get(0).getName(), events));
@@ -3250,11 +3250,11 @@ public class TestVertexImpl {
         List<TaskLocationHint> locationHints) {
       List<Event> events = Lists.newArrayListWithCapacity(targetTasks + 1);
 
-      RootInputConfigureVertexTasksEvent configEvent = new RootInputConfigureVertexTasksEvent(
+      InputConfigureVertexTasksEvent configEvent = new InputConfigureVertexTasksEvent(
           targetTasks, locationHints, null);
       events.add(configEvent);
       for (int i = 0; i < targetTasks; i++) {
-        RootInputDataInformationEvent diEvent = new RootInputDataInformationEvent(
+        InputDataInformationEvent diEvent = new InputDataInformationEvent(
             i, null);
         events.add(diEvent);
       }
@@ -3316,8 +3316,8 @@ public class TestVertexImpl {
     Assert.assertEquals(VertexState.INITIALIZING, vC.getState());
     
     // setting the edge manager should vA to start
-    EdgeManagerDescriptor mockEdgeManagerDescriptor =
-        new EdgeManagerDescriptor(EdgeManagerForTest.class.getName());
+    EdgeManagerPluginDescriptor mockEdgeManagerDescriptor =
+        new EdgeManagerPluginDescriptor(EdgeManagerForTest.class.getName());
     Edge e = vC.sourceVertices.get(vA);
     Assert.assertNull(e.getEdgeManager());
     e.setCustomEdgeManager(mockEdgeManagerDescriptor);
@@ -3326,7 +3326,7 @@ public class TestVertexImpl {
     Assert.assertEquals(VertexState.INITIALIZING, vB.getState());
     Assert.assertEquals(VertexState.INITIALIZING, vC.getState());
     
-    Map<String, EdgeManagerDescriptor> edges = Maps.newHashMap();
+    Map<String, EdgeManagerPluginDescriptor> edges = Maps.newHashMap();
     edges.put("B", mockEdgeManagerDescriptor);
     vC.setParallelism(2, vertexLocationHint, edges, null);
 
@@ -3419,22 +3419,22 @@ public class TestVertexImpl {
     @Override
     public void onRootVertexInitialized(String inputName, InputDescriptor inputDescriptor,
         List<Event> events) {
-      Map<String, RootInputSpecUpdate> map = new HashMap<String, RootInputSpecUpdate>();
+      Map<String, InputSpecUpdate> map = new HashMap<String, InputSpecUpdate>();
       if (getContext().getUserPayload()[0] == 0) {
-        map.put("input3", RootInputSpecUpdate.createAllTaskRootInputSpecUpdate(4));
+        map.put("input3", InputSpecUpdate.createAllTaskInputSpecUpdate(4));
       } else {
         List<Integer> pInputList = new LinkedList<Integer>();
         for (int i = 1; i <= NUM_TASKS; i++) {
           pInputList.add(i);
         }
-        map.put("input4", RootInputSpecUpdate.createPerTaskRootInputSpecUpdate(pInputList));
+        map.put("input4", InputSpecUpdate.createPerTaskInputSpecUpdate(pInputList));
       }
       getContext().setVertexParallelism(NUM_TASKS, null, null, map);
     }
   }
 
   @InterfaceAudience.Private
-  public static class EventHandlingRootInputInitializer extends TezRootInputInitializer {
+  public static class EventHandlingRootInputInitializer extends InputInitializer {
 
     final AtomicBoolean initStarted = new AtomicBoolean(false);
     final AtomicBoolean eventReceived = new AtomicBoolean(false);
@@ -3444,7 +3444,7 @@ public class TestVertexImpl {
     private final Condition eventCondition = lock.newCondition();
 
     public EventHandlingRootInputInitializer(
-        TezRootInputInitializerContext initializerContext) {
+        InputInitializerContext initializerContext) {
       super(initializerContext);
     }
 
@@ -3458,14 +3458,14 @@ public class TestVertexImpl {
         lock.unlock();
       }
       initComplete.set(true);
-      RootInputDataInformationEvent diEvent = new RootInputDataInformationEvent(0, new byte[]{0});
+      InputDataInformationEvent diEvent = new InputDataInformationEvent(0, new byte[]{0});
       List<Event> eventList = new LinkedList<Event>();
       eventList.add(diEvent);
       return eventList;
     }
 
     @Override
-    public void handleInputInitializerEvent(List<RootInputInitializerEvent> events) throws
+    public void handleInputInitializerEvent(List<InputInitializerEvent> events) throws
         Exception {
       eventReceived.set(true);
       lock.lock();

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java b/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java
index 5c79f22..6aa5b99 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.tez.common.ReflectionUtils;
 import org.apache.tez.common.counters.TezCounters;
-import org.apache.tez.dag.api.EdgeManagerDescriptor;
+import org.apache.tez.dag.api.EdgeManagerPluginDescriptor;
 import org.apache.tez.dag.api.VertexLocationHint;
 import org.apache.tez.dag.api.VertexLocationHint.TaskLocationHint;
 import org.apache.tez.dag.api.oldrecords.TaskAttemptState;
@@ -44,7 +44,7 @@ import org.apache.tez.dag.records.TezTaskAttemptID;
 import org.apache.tez.dag.records.TezTaskID;
 import org.apache.tez.dag.records.TezVertexID;
 import org.apache.tez.dag.recovery.records.RecoveryProtos.SummaryEventProto;
-import org.apache.tez.runtime.api.RootInputSpecUpdate;
+import org.apache.tez.runtime.api.InputSpecUpdate;
 import org.apache.tez.runtime.api.events.DataMovementEvent;
 import org.apache.tez.runtime.api.impl.EventMetaData;
 import org.apache.tez.runtime.api.impl.EventMetaData.EventProducerConsumerType;
@@ -265,11 +265,11 @@ public class TestHistoryEventsProtoConversion {
 
   private void testVertexParallelismUpdatedEvent() throws Exception {
     {
-      RootInputSpecUpdate rootInputSpecUpdateBulk = RootInputSpecUpdate
-          .createAllTaskRootInputSpecUpdate(2);
-      RootInputSpecUpdate rootInputSpecUpdatePerTask = RootInputSpecUpdate
-          .createPerTaskRootInputSpecUpdate(Lists.newArrayList(1, 2, 3));
-      Map<String, RootInputSpecUpdate> rootInputSpecUpdates = new HashMap<String, RootInputSpecUpdate>();
+      InputSpecUpdate rootInputSpecUpdateBulk = InputSpecUpdate
+          .createAllTaskInputSpecUpdate(2);
+      InputSpecUpdate rootInputSpecUpdatePerTask = InputSpecUpdate
+          .createPerTaskInputSpecUpdate(Lists.newArrayList(1, 2, 3));
+      Map<String, InputSpecUpdate> rootInputSpecUpdates = new HashMap<String, InputSpecUpdate>();
       rootInputSpecUpdates.put("input1", rootInputSpecUpdateBulk);
       rootInputSpecUpdates.put("input2", rootInputSpecUpdatePerTask);
       VertexParallelismUpdatedEvent event =
@@ -287,8 +287,8 @@ public class TestHistoryEventsProtoConversion {
           deserializedEvent.getVertexLocationHint());
       Assert.assertEquals(event.getRootInputSpecUpdates().size(), deserializedEvent
           .getRootInputSpecUpdates().size());
-      RootInputSpecUpdate deserializedBulk = deserializedEvent.getRootInputSpecUpdates().get("input1");
-      RootInputSpecUpdate deserializedPerTask = deserializedEvent.getRootInputSpecUpdates().get("input2");
+      InputSpecUpdate deserializedBulk = deserializedEvent.getRootInputSpecUpdates().get("input1");
+      InputSpecUpdate deserializedPerTask = deserializedEvent.getRootInputSpecUpdates().get("input2");
       Assert.assertEquals(rootInputSpecUpdateBulk.isForAllWorkUnits(),
           deserializedBulk.isForAllWorkUnits());
       Assert.assertEquals(rootInputSpecUpdateBulk.getAllNumPhysicalInputs(),
@@ -300,10 +300,10 @@ public class TestHistoryEventsProtoConversion {
       logEvents(event, deserializedEvent);
     }
     {
-      Map<String,EdgeManagerDescriptor> sourceEdgeManagers
-          = new LinkedHashMap<String, EdgeManagerDescriptor>();
-      sourceEdgeManagers.put("foo", new EdgeManagerDescriptor("bar"));
-      sourceEdgeManagers.put("foo1", new EdgeManagerDescriptor("bar1").setUserPayload(
+      Map<String,EdgeManagerPluginDescriptor> sourceEdgeManagers
+          = new LinkedHashMap<String, EdgeManagerPluginDescriptor>();
+      sourceEdgeManagers.put("foo", new EdgeManagerPluginDescriptor("bar"));
+      sourceEdgeManagers.put("foo1", new EdgeManagerPluginDescriptor("bar1").setUserPayload(
           new String("payload").getBytes()));
       VertexParallelismUpdatedEvent event =
           new VertexParallelismUpdatedEvent(

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-dag/src/test/java/org/apache/tez/runtime/task/TestTaskExecution.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/runtime/task/TestTaskExecution.java b/tez-dag/src/test/java/org/apache/tez/runtime/task/TestTaskExecution.java
index b733682..f4723d2 100644
--- a/tez-dag/src/test/java/org/apache/tez/runtime/task/TestTaskExecution.java
+++ b/tez-dag/src/test/java/org/apache/tez/runtime/task/TestTaskExecution.java
@@ -60,7 +60,7 @@ import org.apache.tez.dag.records.TezDAGID;
 import org.apache.tez.dag.records.TezTaskAttemptID;
 import org.apache.tez.dag.records.TezTaskID;
 import org.apache.tez.dag.records.TezVertexID;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.api.events.TaskAttemptCompletedEvent;
 import org.apache.tez.runtime.api.events.TaskAttemptFailedEvent;
 import org.apache.tez.runtime.api.impl.InputSpec;
@@ -389,7 +389,7 @@ public class TestTaskExecution {
     private boolean signalFatalAndLoop = false;
     private boolean signalFatalAndComplete = false;
 
-    public TestProcessor(TezProcessorContext context) {
+    public TestProcessor(ProcessorContext context) {
       super(context);
     }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-dag/src/test/java/org/apache/tez/test/EdgeManagerForTest.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/test/EdgeManagerForTest.java b/tez-dag/src/test/java/org/apache/tez/test/EdgeManagerForTest.java
index a777022..ab227a8 100644
--- a/tez-dag/src/test/java/org/apache/tez/test/EdgeManagerForTest.java
+++ b/tez-dag/src/test/java/org/apache/tez/test/EdgeManagerForTest.java
@@ -21,20 +21,20 @@ package org.apache.tez.test;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.tez.dag.api.EdgeManager;
-import org.apache.tez.dag.api.EdgeManagerContext;
+import org.apache.tez.dag.api.EdgeManagerPlugin;
+import org.apache.tez.dag.api.EdgeManagerPluginContext;
 import org.apache.tez.runtime.api.events.DataMovementEvent;
 import org.apache.tez.runtime.api.events.InputReadErrorEvent;
 
-public class EdgeManagerForTest extends EdgeManager {
+public class EdgeManagerForTest extends EdgeManagerPlugin {
 
   private byte[] userPayload;
 
-  public EdgeManagerForTest(EdgeManagerContext context) {
+  public EdgeManagerForTest(EdgeManagerPluginContext context) {
     super(context);
   }
 
-  public EdgeManagerContext getEdgeManagerContext() {
+  public EdgeManagerPluginContext getEdgeManagerContext() {
     return getContext();
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce-examples/src/main/java/org/apache/tez/examples/OrderedWordCount.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/examples/OrderedWordCount.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/examples/OrderedWordCount.java
index 217d0b7..6f4c40d 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/examples/OrderedWordCount.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/examples/OrderedWordCount.java
@@ -46,7 +46,7 @@ import org.apache.tez.mapreduce.examples.WordCount.TokenProcessor;
 import org.apache.tez.mapreduce.input.MRInput;
 import org.apache.tez.mapreduce.output.MROutput;
 import org.apache.tez.mapreduce.processor.SimpleMRProcessor;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.library.api.KeyValueWriter;
 import org.apache.tez.runtime.library.api.KeyValuesReader;
 import org.apache.tez.runtime.library.conf.OrderedPartitionedKVEdgeConfigurer;
@@ -58,7 +58,7 @@ import com.google.common.base.Preconditions;
 public class OrderedWordCount extends Configured implements Tool  {
   
   public static class SumProcessor extends SimpleProcessor {
-    public SumProcessor(TezProcessorContext context) {
+    public SumProcessor(ProcessorContext context) {
       super(context);
     }
 
@@ -86,7 +86,7 @@ public class OrderedWordCount extends Configured implements Tool  {
    */
   public static class NoOpSorter extends SimpleMRProcessor {
 
-    public NoOpSorter(TezProcessorContext context) {
+    public NoOpSorter(ProcessorContext context) {
       super(context);
     }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/BroadcastAndOneToOneExample.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/BroadcastAndOneToOneExample.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/BroadcastAndOneToOneExample.java
index 74b2cb9..e34001e 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/BroadcastAndOneToOneExample.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/BroadcastAndOneToOneExample.java
@@ -44,7 +44,7 @@ import org.apache.tez.dag.api.VertexManagerPluginDescriptor;
 import org.apache.tez.dag.api.client.DAGClient;
 import org.apache.tez.dag.api.client.DAGStatus;
 import org.apache.tez.dag.library.vertexmanager.InputReadyVertexManager;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.common.objectregistry.ObjectRegistry;
 import org.apache.tez.runtime.library.api.KeyValueReader;
 import org.apache.tez.runtime.library.api.KeyValueWriter;
@@ -58,7 +58,7 @@ public class BroadcastAndOneToOneExample extends Configured implements Tool {
   public static class InputProcessor extends SimpleProcessor {
     Text word = new Text();
 
-    public InputProcessor(TezProcessorContext context) {
+    public InputProcessor(ProcessorContext context) {
       super(context);
     }
 
@@ -84,7 +84,7 @@ public class BroadcastAndOneToOneExample extends Configured implements Tool {
   public static class OneToOneProcessor extends SimpleProcessor {
     Text word = new Text();
 
-    public OneToOneProcessor(TezProcessorContext context) {
+    public OneToOneProcessor(ProcessorContext context) {
       super(context);
     }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java
index 817fff5..ff9f317 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWord.java
@@ -78,7 +78,7 @@ import org.apache.tez.mapreduce.input.MRInputLegacy;
 import org.apache.tez.mapreduce.output.MROutput;
 import org.apache.tez.processor.FilterByWordInputProcessor;
 import org.apache.tez.processor.FilterByWordOutputProcessor;
-import org.apache.tez.runtime.api.TezRootInputInitializer;
+import org.apache.tez.runtime.api.InputInitializer;
 import org.apache.tez.runtime.library.conf.UnorderedUnpartitionedKVEdgeConfigurer;
 
 import com.google.common.collect.Sets;
@@ -198,7 +198,7 @@ public class FilterLinesByWord extends Configured implements Tool {
     }
 
     // Configure the Input for stage1
-    Class<? extends TezRootInputInitializer> initializerClazz = generateSplitsInClient ? null
+    Class<? extends InputInitializer> initializerClazz = generateSplitsInClient ? null
         : MRInputAMSplitGenerator.class;
     stage1Vertex.addDataSource(
         "MRInput",

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWordOneToOne.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWordOneToOne.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWordOneToOne.java
index 43309b1..6047af9 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWordOneToOne.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/FilterLinesByWordOneToOne.java
@@ -71,7 +71,7 @@ import org.apache.tez.mapreduce.input.MRInputLegacy;
 import org.apache.tez.mapreduce.output.MROutput;
 import org.apache.tez.processor.FilterByWordInputProcessor;
 import org.apache.tez.processor.FilterByWordOutputProcessor;
-import org.apache.tez.runtime.api.TezRootInputInitializer;
+import org.apache.tez.runtime.api.InputInitializer;
 import org.apache.tez.runtime.library.conf.UnorderedUnpartitionedKVEdgeConfigurer;
 
 public class FilterLinesByWordOneToOne extends Configured implements Tool {
@@ -186,7 +186,7 @@ public class FilterLinesByWordOneToOne extends Configured implements Tool {
     }
 
     // Configure the Input for stage1
-    Class<? extends TezRootInputInitializer> initializerClazz = generateSplitsInClient ? null
+    Class<? extends InputInitializer> initializerClazz = generateSplitsInClient ? null
         : MRInputAMSplitGenerator.class;
     stage1Vertex.addDataSource(
         "MRInput",

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectDataGen.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectDataGen.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectDataGen.java
index 3e11870..a6a5dbd 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectDataGen.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectDataGen.java
@@ -48,7 +48,7 @@ import org.apache.tez.dag.api.client.DAGClient;
 import org.apache.tez.dag.api.client.DAGStatus;
 import org.apache.tez.mapreduce.output.MROutput;
 import org.apache.tez.mapreduce.processor.SimpleMRProcessor;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.library.api.KeyValueWriter;
 
 import com.google.common.base.Preconditions;
@@ -224,7 +224,7 @@ public class IntersectDataGen extends Configured implements Tool {
     long hashOutputFileSize;
     float overlapApprox = 0.2f;
 
-    public GenDataProcessor(TezProcessorContext context) {
+    public GenDataProcessor(ProcessorContext context) {
       super(context);
     }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectExample.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectExample.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectExample.java
index b226d9c..6caafce 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectExample.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectExample.java
@@ -52,7 +52,7 @@ import org.apache.tez.mapreduce.processor.SimpleMRProcessor;
 import org.apache.tez.runtime.api.LogicalInput;
 import org.apache.tez.runtime.api.LogicalOutput;
 import org.apache.tez.runtime.api.Reader;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.library.api.KeyValueReader;
 import org.apache.tez.runtime.library.api.KeyValueWriter;
 import org.apache.tez.runtime.library.conf.UnorderedPartitionedKVEdgeConfigurer;
@@ -219,7 +219,7 @@ public class IntersectExample extends Configured implements Tool {
    * Reads key-values from the source and forwards the value as the key for the output
    */
   public static class ForwardingProcessor extends SimpleProcessor {
-    public ForwardingProcessor(TezProcessorContext context) {
+    public ForwardingProcessor(ProcessorContext context) {
       super(context);
     }
 
@@ -244,7 +244,7 @@ public class IntersectExample extends Configured implements Tool {
 
   public static class IntersectProcessor extends SimpleMRProcessor {
 
-    public IntersectProcessor(TezProcessorContext context) {
+    public IntersectProcessor(ProcessorContext context) {
       super(context);
     }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectValidate.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectValidate.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectValidate.java
index 5dd7d99..02a7563 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectValidate.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/IntersectValidate.java
@@ -47,7 +47,7 @@ import org.apache.tez.mapreduce.examples.IntersectExample.ForwardingProcessor;
 import org.apache.tez.mapreduce.input.MRInput;
 import org.apache.tez.runtime.api.LogicalInput;
 import org.apache.tez.runtime.api.Reader;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.library.api.KeyValuesReader;
 import org.apache.tez.runtime.library.conf.OrderedPartitionedKVEdgeConfigurer;
 import org.apache.tez.runtime.library.partitioner.HashPartitioner;
@@ -215,7 +215,7 @@ public class IntersectValidate extends Configured implements Tool {
 
     private static final Log LOG = LogFactory.getLog(IntersectValidateProcessor.class);
 
-    public IntersectValidateProcessor(TezProcessorContext context) {
+    public IntersectValidateProcessor(ProcessorContext context) {
       super(context);
     }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java
index ccf55af..583c360 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java
@@ -74,7 +74,7 @@ import org.apache.tez.mapreduce.hadoop.MRHelpers;
 import org.apache.tez.mapreduce.hadoop.MRJobConfig;
 import org.apache.tez.mapreduce.processor.map.MapProcessor;
 import org.apache.tez.mapreduce.processor.reduce.ReduceProcessor;
-import org.apache.tez.runtime.api.TezRootInputInitializer;
+import org.apache.tez.runtime.api.InputInitializer;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
 import org.apache.tez.runtime.library.conf.OrderedPartitionedKVEdgeConfigurer;
 import org.apache.tez.runtime.library.partitioner.HashPartitioner;
@@ -223,7 +223,7 @@ public class TestOrderedWordCount extends Configured implements Tool {
       mapVertex.setTaskLocalFiles(commonLocalResources);
     }
 
-    Class<? extends TezRootInputInitializer> initializerClazz = generateSplitsInClient ? null
+    Class<? extends InputInitializer> initializerClazz = generateSplitsInClient ? null
         : MRInputAMSplitGenerator.class;
     MRHelpers.addMRInput(mapVertex, mapInputPayload,
         (initializerClazz==null) ? null :

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/UnionExample.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/UnionExample.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/UnionExample.java
index 90d3090..487d6ee 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/UnionExample.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/UnionExample.java
@@ -55,7 +55,7 @@ import org.apache.tez.mapreduce.output.MROutput;
 import org.apache.tez.mapreduce.processor.SimpleMRProcessor;
 import org.apache.tez.runtime.api.LogicalInput;
 import org.apache.tez.runtime.api.Output;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.library.api.KeyValueReader;
 import org.apache.tez.runtime.library.api.KeyValueWriter;
 import org.apache.tez.runtime.library.api.KeyValuesReader;
@@ -72,7 +72,7 @@ public class UnionExample {
     IntWritable one = new IntWritable(1);
     Text word = new Text();
 
-    public TokenProcessor(TezProcessorContext context) {
+    public TokenProcessor(ProcessorContext context) {
       super(context);
     }
 
@@ -112,7 +112,7 @@ public class UnionExample {
   public static class UnionProcessor extends SimpleMRProcessor {
     IntWritable one = new IntWritable(1);
 
-    public UnionProcessor(TezProcessorContext context) {
+    public UnionProcessor(ProcessorContext context) {
       super(context);
     }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/WordCount.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/WordCount.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/WordCount.java
index d408146..1766b9e 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/WordCount.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/WordCount.java
@@ -43,7 +43,7 @@ import org.apache.tez.mapreduce.input.MRInput;
 import org.apache.tez.mapreduce.output.MROutput;
 import org.apache.tez.mapreduce.processor.SimpleMRProcessor;
 import org.apache.tez.runtime.api.Output;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.library.api.KeyValueReader;
 import org.apache.tez.runtime.library.api.KeyValueWriter;
 import org.apache.tez.runtime.library.api.KeyValuesReader;
@@ -60,7 +60,7 @@ public class WordCount extends Configured implements Tool {
     IntWritable one = new IntWritable(1);
     Text word = new Text();
 
-    public TokenProcessor(TezProcessorContext context) {
+    public TokenProcessor(ProcessorContext context) {
       super(context);
     }
 
@@ -84,7 +84,7 @@ public class WordCount extends Configured implements Tool {
   }
 
   public static class SumProcessor extends SimpleMRProcessor {
-    public SumProcessor(TezProcessorContext context) {
+    public SumProcessor(ProcessorContext context) {
       super(context);
     }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordInputProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordInputProcessor.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordInputProcessor.java
index e88ed2f..aa7b836 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordInputProcessor.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordInputProcessor.java
@@ -36,7 +36,7 @@ import org.apache.tez.runtime.api.AbstractLogicalIOProcessor;
 import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.LogicalInput;
 import org.apache.tez.runtime.api.LogicalOutput;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.library.api.KeyValueReader;
 import org.apache.tez.runtime.library.api.KeyValueWriter;
 import org.apache.tez.runtime.library.output.OnFileUnorderedKVOutput;
@@ -47,7 +47,7 @@ public class FilterByWordInputProcessor extends AbstractLogicalIOProcessor {
 
   private String filterWord;
 
-  public FilterByWordInputProcessor(TezProcessorContext context) {
+  public FilterByWordInputProcessor(ProcessorContext context) {
     super(context);
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordOutputProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordOutputProcessor.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordOutputProcessor.java
index c9247f4..9eca13f 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordOutputProcessor.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordOutputProcessor.java
@@ -28,7 +28,7 @@ import org.apache.tez.mapreduce.processor.map.MapProcessor;
 import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.LogicalInput;
 import org.apache.tez.runtime.api.LogicalOutput;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.library.api.KeyValueReader;
 import org.apache.tez.runtime.library.api.KeyValueWriter;
 import org.apache.tez.runtime.library.input.ShuffledUnorderedKVInput;
@@ -38,7 +38,7 @@ public class FilterByWordOutputProcessor extends SimpleMRProcessor {
 
   private static final Log LOG = LogFactory.getLog(MapProcessor.class);
 
-  public FilterByWordOutputProcessor(TezProcessorContext context) {
+  public FilterByWordOutputProcessor(ProcessorContext context) {
     super(context);
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java
index 3bc8da2..96c03c6 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java
@@ -46,9 +46,9 @@ import org.apache.tez.mapreduce.hadoop.MRConfig;
 import org.apache.tez.mapreduce.hadoop.MRJobConfig;
 import org.apache.tez.mapreduce.hadoop.mapred.MRCounters;
 import org.apache.tez.mapreduce.processor.MRTaskReporter;
-import org.apache.tez.runtime.api.TezInputContext;
-import org.apache.tez.runtime.api.TezOutputContext;
-import org.apache.tez.runtime.api.TezTaskContext;
+import org.apache.tez.runtime.api.InputContext;
+import org.apache.tez.runtime.api.OutputContext;
+import org.apache.tez.runtime.api.TaskContext;
 import org.apache.tez.runtime.library.common.ConfigUtils;
 import org.apache.tez.runtime.library.common.ValuesIterator;
 import org.apache.tez.runtime.library.common.combine.Combiner;
@@ -72,20 +72,20 @@ public class MRCombiner implements Combiner {
   private final MRTaskReporter reporter;
   private final TaskAttemptID mrTaskAttemptID;
 
-  public MRCombiner(TezTaskContext taskContext) throws IOException {
+  public MRCombiner(TaskContext taskContext) throws IOException {
     this.conf = TezUtils.createConfFromUserPayload(taskContext.getUserPayload());
 
-    assert(taskContext instanceof TezInputContext || taskContext instanceof TezOutputContext);
-    if (taskContext instanceof TezOutputContext) {
+    assert(taskContext instanceof InputContext || taskContext instanceof OutputContext);
+    if (taskContext instanceof OutputContext) {
       this.keyClass = ConfigUtils.getIntermediateOutputKeyClass(conf);
       this.valClass = ConfigUtils.getIntermediateOutputValueClass(conf);
       this.comparator = ConfigUtils.getIntermediateOutputKeyComparator(conf);
-      this.reporter = new MRTaskReporter((TezOutputContext)taskContext);
+      this.reporter = new MRTaskReporter((OutputContext)taskContext);
     } else {
       this.keyClass = ConfigUtils.getIntermediateInputKeyClass(conf);
       this.valClass = ConfigUtils.getIntermediateInputValueClass(conf);
       this.comparator = ConfigUtils.getIntermediateInputKeyComparator(conf);
-      this.reporter = new MRTaskReporter((TezInputContext)taskContext);
+      this.reporter = new MRTaskReporter((InputContext)taskContext);
     }
 
     this.useNewApi = ConfigUtils.useNewApi(conf);

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java
index 6420005..4fd134b 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputAMSplitGenerator.java
@@ -35,21 +35,21 @@ import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRInputUserPayloadProto;
 import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRSplitProto;
 import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRSplitsProto;
 import org.apache.tez.runtime.api.Event;
-import org.apache.tez.runtime.api.RootInputSpecUpdate;
-import org.apache.tez.runtime.api.TezRootInputInitializer;
-import org.apache.tez.runtime.api.TezRootInputInitializerContext;
-import org.apache.tez.runtime.api.events.RootInputConfigureVertexTasksEvent;
-import org.apache.tez.runtime.api.events.RootInputDataInformationEvent;
-import org.apache.tez.runtime.api.events.RootInputInitializerEvent;
+import org.apache.tez.runtime.api.InputSpecUpdate;
+import org.apache.tez.runtime.api.InputInitializer;
+import org.apache.tez.runtime.api.InputInitializerContext;
+import org.apache.tez.runtime.api.events.InputConfigureVertexTasksEvent;
+import org.apache.tez.runtime.api.events.InputDataInformationEvent;
+import org.apache.tez.runtime.api.events.InputInitializerEvent;
 
-public class MRInputAMSplitGenerator extends TezRootInputInitializer {
+public class MRInputAMSplitGenerator extends InputInitializer {
 
   private boolean sendSerializedEvents;
   
   private static final Log LOG = LogFactory.getLog(MRInputAMSplitGenerator.class);
 
   public MRInputAMSplitGenerator(
-      TezRootInputInitializerContext initializerContext) {
+      InputInitializerContext initializerContext) {
     super(initializerContext);
   }
 
@@ -117,9 +117,9 @@ public class MRInputAMSplitGenerator extends TezRootInputInitializer {
     List<Event> events = Lists.newArrayListWithCapacity(inputSplitInfo
         .getNumTasks() + 1);
     
-    RootInputConfigureVertexTasksEvent configureVertexEvent = new RootInputConfigureVertexTasksEvent(
+    InputConfigureVertexTasksEvent configureVertexEvent = new InputConfigureVertexTasksEvent(
         inputSplitInfo.getNumTasks(), inputSplitInfo.getTaskLocationHints(),
-        RootInputSpecUpdate.getDefaultSinglePhysicalInputSpecUpdate());
+        InputSpecUpdate.getDefaultSinglePhysicalInputSpecUpdate());
     events.add(configureVertexEvent);
 
     if (sendSerializedEvents) {
@@ -127,7 +127,7 @@ public class MRInputAMSplitGenerator extends TezRootInputInitializer {
       int count = 0;
       for (MRSplitProto mrSplit : splitsProto.getSplitsList()) {
         // Unnecessary array copy, can be avoided by using ByteBuffer instead of a raw array.
-        RootInputDataInformationEvent diEvent = new RootInputDataInformationEvent(count++,
+        InputDataInformationEvent diEvent = new InputDataInformationEvent(count++,
             mrSplit.toByteArray());
         events.add(diEvent);
       }
@@ -135,12 +135,12 @@ public class MRInputAMSplitGenerator extends TezRootInputInitializer {
       int count = 0;
       if (inputSplitInfo.holdsNewFormatSplits()) {
         for (org.apache.hadoop.mapreduce.InputSplit split : inputSplitInfo.getNewFormatSplits()) {
-          RootInputDataInformationEvent diEvent = new RootInputDataInformationEvent(count++, split);
+          InputDataInformationEvent diEvent = new InputDataInformationEvent(count++, split);
           events.add(diEvent);
         }
       } else {
         for (org.apache.hadoop.mapred.InputSplit split : inputSplitInfo.getOldFormatSplits()) {
-          RootInputDataInformationEvent diEvent = new RootInputDataInformationEvent(count++, split);
+          InputDataInformationEvent diEvent = new InputDataInformationEvent(count++, split);
           events.add(diEvent);
         }
       }
@@ -150,7 +150,7 @@ public class MRInputAMSplitGenerator extends TezRootInputInitializer {
   }
 
   @Override
-  public void handleInputInitializerEvent(List<RootInputInitializerEvent> events) throws Exception {
+  public void handleInputInitializerEvent(List<InputInitializerEvent> events) throws Exception {
     throw new UnsupportedOperationException("Not expecting to handle any events");
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputSplitDistributor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputSplitDistributor.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputSplitDistributor.java
index 68c3f05..4be903f 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputSplitDistributor.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/common/MRInputSplitDistributor.java
@@ -32,16 +32,16 @@ import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRInputUserPayloadProto;
 import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRSplitProto;
 import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRSplitsProto;
 import org.apache.tez.runtime.api.Event;
-import org.apache.tez.runtime.api.TezRootInputInitializer;
-import org.apache.tez.runtime.api.TezRootInputInitializerContext;
-import org.apache.tez.runtime.api.events.RootInputDataInformationEvent;
-import org.apache.tez.runtime.api.events.RootInputInitializerEvent;
-import org.apache.tez.runtime.api.events.RootInputUpdatePayloadEvent;
+import org.apache.tez.runtime.api.InputInitializer;
+import org.apache.tez.runtime.api.InputInitializerContext;
+import org.apache.tez.runtime.api.events.InputDataInformationEvent;
+import org.apache.tez.runtime.api.events.InputInitializerEvent;
+import org.apache.tez.runtime.api.events.InputUpdatePayloadEvent;
 
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;
 
-public class MRInputSplitDistributor extends TezRootInputInitializer {
+public class MRInputSplitDistributor extends InputInitializer {
 
   private static final Log LOG = LogFactory.getLog(MRInputSplitDistributor.class);
   
@@ -49,7 +49,7 @@ public class MRInputSplitDistributor extends TezRootInputInitializer {
 
   private MRSplitsProto splitsProto;
 
-  public MRInputSplitDistributor(TezRootInputInitializerContext initializerContext) {
+  public MRInputSplitDistributor(InputInitializerContext initializerContext) {
     super(initializerContext);
   }
 
@@ -80,7 +80,7 @@ public class MRInputSplitDistributor extends TezRootInputInitializer {
     updatedPayloadBuilder.clearSplits();
 
     List<Event> events = Lists.newArrayListWithCapacity(this.splitsProto.getSplitsCount() + 1);
-    RootInputUpdatePayloadEvent updatePayloadEvent = new RootInputUpdatePayloadEvent(
+    InputUpdatePayloadEvent updatePayloadEvent = new InputUpdatePayloadEvent(
         updatedPayloadBuilder.build().toByteArray());
 
     events.add(updatePayloadEvent);
@@ -88,21 +88,21 @@ public class MRInputSplitDistributor extends TezRootInputInitializer {
 
     for (MRSplitProto mrSplit : this.splitsProto.getSplitsList()) {
 
-      RootInputDataInformationEvent diEvent;
+      InputDataInformationEvent diEvent;
 
       if (sendSerializedEvents) {
         // Unnecessary array copy, can be avoided by using ByteBuffer instead of
         // a raw array.
-        diEvent = new RootInputDataInformationEvent(count++, mrSplit.toByteArray());
+        diEvent = new InputDataInformationEvent(count++, mrSplit.toByteArray());
       } else {
         if (useNewApi) {
           org.apache.hadoop.mapreduce.InputSplit newInputSplit = MRInputUtils
               .getNewSplitDetailsFromEvent(mrSplit, conf);
-          diEvent = new RootInputDataInformationEvent(count++, newInputSplit);
+          diEvent = new InputDataInformationEvent(count++, newInputSplit);
         } else {
           org.apache.hadoop.mapred.InputSplit oldInputSplit = MRInputUtils
               .getOldSplitDetailsFromEvent(mrSplit, conf);
-          diEvent = new RootInputDataInformationEvent(count++, oldInputSplit);
+          diEvent = new InputDataInformationEvent(count++, oldInputSplit);
         }
       }
       events.add(diEvent);
@@ -112,7 +112,7 @@ public class MRInputSplitDistributor extends TezRootInputInitializer {
   }
 
   @Override
-  public void handleInputInitializerEvent(List<RootInputInitializerEvent> events) throws Exception {
+  public void handleInputInitializerEvent(List<InputInitializerEvent> events) throws Exception {
     throw new UnsupportedOperationException("Not expecting to handle any events");
   }
 }

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/MapContextImpl.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/MapContextImpl.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/MapContextImpl.java
index 0014b1d..87b0b31 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/MapContextImpl.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/MapContextImpl.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.mapreduce.OutputCommitter;
 import org.apache.hadoop.mapreduce.RecordReader;
 import org.apache.hadoop.mapreduce.RecordWriter;
 import org.apache.hadoop.mapreduce.TaskAttemptID;
-import org.apache.tez.runtime.api.TezTaskContext;
+import org.apache.tez.runtime.api.TaskContext;
 
 /**
  * The context that is given to the {@link Mapper}.
@@ -52,7 +52,7 @@ public class MapContextImpl<KEYIN,VALUEIN,KEYOUT,VALUEOUT>
                         RecordReader<KEYIN,VALUEIN> reader,
                         RecordWriter<KEYOUT,VALUEOUT> writer,
                         OutputCommitter committer,
-                        TezTaskContext context,
+                        TaskContext context,
                         InputSplit split, Reporter reporter) {
     super(conf, taskid, writer, committer, context, reporter);
     this.reader = reader;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/TaskInputOutputContextImpl.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/TaskInputOutputContextImpl.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/TaskInputOutputContextImpl.java
index 44e30a8..cad73a8 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/TaskInputOutputContextImpl.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/TaskInputOutputContextImpl.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.mapreduce.RecordWriter;
 import org.apache.hadoop.mapreduce.Reducer;
 import org.apache.hadoop.mapreduce.TaskAttemptID;
 import org.apache.hadoop.mapreduce.TaskInputOutputContext;
-import org.apache.tez.runtime.api.TezTaskContext;
+import org.apache.tez.runtime.api.TaskContext;
 
 /**
  * A context object that allows input and output from the task. It is only
@@ -51,7 +51,7 @@ public abstract class TaskInputOutputContextImpl<KEYIN,VALUEIN,KEYOUT,VALUEOUT>
   public TaskInputOutputContextImpl(Configuration conf, TaskAttemptID taskid,
                                     RecordWriter<KEYOUT,VALUEOUT> output,
                                     OutputCommitter committer,
-                                    TezTaskContext context, Reporter reporter) {
+                                    TaskContext context, Reporter reporter) {
     super(conf, taskid, context.getCounters(), reporter);
     this.output = output;
     this.committer = committer;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
index 38c5d32..1f4ed8a 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInput.java
@@ -55,8 +55,8 @@ import org.apache.tez.mapreduce.lib.MRReaderMapred;
 import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRSplitProto;
 import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.Input;
-import org.apache.tez.runtime.api.TezInputContext;
-import org.apache.tez.runtime.api.events.RootInputDataInformationEvent;
+import org.apache.tez.runtime.api.InputContext;
+import org.apache.tez.runtime.api.events.InputDataInformationEvent;
 import org.apache.tez.runtime.library.api.KeyValueReader;
 
 import com.google.common.base.Preconditions;
@@ -279,7 +279,7 @@ public class MRInput extends MRInputBase {
   @Private
   volatile boolean splitInfoViaEvents;
 
-  public MRInput(TezInputContext inputContext, int numPhysicalInputs) {
+  public MRInput(InputContext inputContext, int numPhysicalInputs) {
     super(inputContext, numPhysicalInputs);
   }
 
@@ -369,12 +369,12 @@ public class MRInput extends MRInputBase {
               + eventReceived);
     }
     Event event = inputEvents.iterator().next();
-    Preconditions.checkArgument(event instanceof RootInputDataInformationEvent,
+    Preconditions.checkArgument(event instanceof InputDataInformationEvent,
         getClass().getSimpleName()
             + " can only handle a single event of type: "
-            + RootInputDataInformationEvent.class.getSimpleName());
+            + InputDataInformationEvent.class.getSimpleName());
 
-    processSplitEvent((RootInputDataInformationEvent)event);
+    processSplitEvent((InputDataInformationEvent)event);
   }
 
   @Override
@@ -402,7 +402,7 @@ public class MRInput extends MRInputBase {
     return mrReader.getProgress();
   }
 
-  void processSplitEvent(RootInputDataInformationEvent event)
+  void processSplitEvent(InputDataInformationEvent event)
       throws IOException {
     rrLock.lock();
     try {
@@ -429,7 +429,7 @@ public class MRInput extends MRInputBase {
   }
 
   @Private
-  void initFromEvent(RootInputDataInformationEvent initEvent)
+  void initFromEvent(InputDataInformationEvent initEvent)
       throws IOException {
     rrLock.lock();
     try {
@@ -439,7 +439,7 @@ public class MRInput extends MRInputBase {
     }
   }
   
-  private void initFromEventInternal(RootInputDataInformationEvent initEvent) throws IOException {
+  private void initFromEventInternal(InputDataInformationEvent initEvent) throws IOException {
     LOG.info("Initializing RecordReader from event");
     Preconditions.checkState(initEvent != null, "InitEvent must be specified");
     MRSplitProto splitProto = MRSplitProto.parseFrom(initEvent.getUserPayload());

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInputLegacy.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInputLegacy.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInputLegacy.java
index c21485e..6915dde 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInputLegacy.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MRInputLegacy.java
@@ -31,15 +31,15 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapred.InputSplit;
 import org.apache.hadoop.mapred.RecordReader;
 import org.apache.tez.mapreduce.input.MRInput.MRInputConfigurer;
-import org.apache.tez.runtime.api.TezInputContext;
-import org.apache.tez.runtime.api.events.RootInputDataInformationEvent;
+import org.apache.tez.runtime.api.InputContext;
+import org.apache.tez.runtime.api.events.InputDataInformationEvent;
 
 @LimitedPrivate("Hive")
 public class MRInputLegacy extends MRInput {
 
   private static final Log LOG = LogFactory.getLog(MRInputLegacy.class);
   
-  private RootInputDataInformationEvent initEvent;
+  private InputDataInformationEvent initEvent;
   private volatile boolean inited = false;
   private ReentrantLock eventLock = new ReentrantLock();
   private Condition eventCondition = eventLock.newCondition();
@@ -68,7 +68,7 @@ public class MRInputLegacy extends MRInput {
         MRInputLegacy.class.getName());
   }
   
-  public MRInputLegacy(TezInputContext inputContext, int numPhysicalInputs) {
+  public MRInputLegacy(InputContext inputContext, int numPhysicalInputs) {
     super(inputContext, numPhysicalInputs);
   }
 
@@ -111,7 +111,7 @@ public class MRInputLegacy extends MRInput {
   }
   
   @Override
-  void processSplitEvent(RootInputDataInformationEvent event) {
+  void processSplitEvent(InputDataInformationEvent event) {
     eventLock.lock();
     try {
       initEvent = event;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MultiMRInput.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MultiMRInput.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MultiMRInput.java
index c6ef81f..f3e414c 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MultiMRInput.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/MultiMRInput.java
@@ -38,15 +38,15 @@ import org.apache.tez.mapreduce.lib.MRReaderMapred;
 import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRSplitProto;
 import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.Reader;
-import org.apache.tez.runtime.api.TezInputContext;
-import org.apache.tez.runtime.api.events.RootInputDataInformationEvent;
+import org.apache.tez.runtime.api.InputContext;
+import org.apache.tez.runtime.api.events.InputDataInformationEvent;
 import org.apache.tez.runtime.library.api.KeyValueReader;
 
 public class MultiMRInput extends MRInputBase {
 
   private static final Log LOG = LogFactory.getLog(MultiMRInput.class);
 
-  public MultiMRInput(TezInputContext inputContext, int numPhysicalInputs) {
+  public MultiMRInput(InputContext inputContext, int numPhysicalInputs) {
     super(inputContext, numPhysicalInputs);
   }
 
@@ -94,7 +94,7 @@ public class MultiMRInput extends MRInputBase {
       Preconditions.checkState(eventCount.get() + inputEvents.size() <= getNumPhysicalInputs(),
           "Unexpected event. All physical sources already initialized");
       for (Event event : inputEvents) {
-        MRReader reader = initFromEvent((RootInputDataInformationEvent) event);
+        MRReader reader = initFromEvent((InputDataInformationEvent) event);
         readers.add(reader);
         if (eventCount.incrementAndGet() == getNumPhysicalInputs()) {
           getContext().inputIsReady();
@@ -106,7 +106,7 @@ public class MultiMRInput extends MRInputBase {
     }
   }
 
-  private MRReader initFromEvent(RootInputDataInformationEvent event) throws IOException {
+  private MRReader initFromEvent(InputDataInformationEvent event) throws IOException {
     Preconditions.checkState(event != null, "Event must be specified");
     LOG.info("Initializing Reader: " + eventCount.get());
     MRSplitProto splitProto = MRSplitProto.parseFrom(event.getUserPayload());

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/base/MRInputBase.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/base/MRInputBase.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/base/MRInputBase.java
index 190d439..32a3934 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/base/MRInputBase.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/input/base/MRInputBase.java
@@ -34,7 +34,7 @@ import org.apache.tez.mapreduce.protos.MRRuntimeProtos;
 import org.apache.tez.runtime.api.AbstractLogicalInput;
 import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.Reader;
-import org.apache.tez.runtime.api.TezInputContext;
+import org.apache.tez.runtime.api.InputContext;
 
 import java.io.IOException;
 import java.util.List;
@@ -46,7 +46,7 @@ public abstract class MRInputBase extends AbstractLogicalInput {
   protected JobConf jobConf;
   protected TezCounter inputRecordCounter;
 
-  public MRInputBase(TezInputContext inputContext, int numPhysicalInputs) {
+  public MRInputBase(InputContext inputContext, int numPhysicalInputs) {
     super(inputContext, numPhysicalInputs);
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutput.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutput.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutput.java
index 709a2c4..34c5b9c 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutput.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutput.java
@@ -56,7 +56,7 @@ import org.apache.tez.mapreduce.hadoop.mapreduce.TaskAttemptContextImpl;
 import org.apache.tez.mapreduce.processor.MRTaskReporter;
 import org.apache.tez.runtime.api.AbstractLogicalOutput;
 import org.apache.tez.runtime.api.Event;
-import org.apache.tez.runtime.api.TezOutputContext;
+import org.apache.tez.runtime.api.OutputContext;
 import org.apache.tez.runtime.library.api.KeyValueWriter;
 
 
@@ -217,7 +217,7 @@ public class MROutput extends AbstractLogicalOutput {
 
   protected OutputCommitter committer;
 
-  public MROutput(TezOutputContext outputContext, int numPhysicalOutputs) {
+  public MROutput(OutputContext outputContext, int numPhysicalOutputs) {
     super(outputContext, numPhysicalOutputs);
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutputLegacy.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutputLegacy.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutputLegacy.java
index f6ac07f..b2a853e 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutputLegacy.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/output/MROutputLegacy.java
@@ -19,11 +19,11 @@
 package org.apache.tez.mapreduce.output;
 
 import org.apache.hadoop.mapreduce.OutputCommitter;
-import org.apache.tez.runtime.api.TezOutputContext;
+import org.apache.tez.runtime.api.OutputContext;
 
 public class MROutputLegacy extends MROutput {
 
-  public MROutputLegacy(TezOutputContext outputContext, int numPhysicalOutputs) {
+  public MROutputLegacy(OutputContext outputContext, int numPhysicalOutputs) {
     super(outputContext, numPhysicalOutputs);
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
index 05eea2b..4e22ca0 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
@@ -79,7 +79,7 @@ import org.apache.tez.mapreduce.output.MROutputLegacy;
 import org.apache.tez.runtime.api.AbstractLogicalIOProcessor;
 import org.apache.tez.runtime.api.LogicalInput;
 import org.apache.tez.runtime.api.LogicalOutput;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.library.common.Constants;
 import org.apache.tez.runtime.library.common.sort.impl.TezRawKeyValueIterator;
 
@@ -95,7 +95,7 @@ public abstract class MRTask extends AbstractLogicalIOProcessor {
 
   // Current counters
   transient TezCounters counters;
-  protected TezProcessorContext processorContext;
+  protected ProcessorContext processorContext;
   protected TaskAttemptID taskAttemptId;
   protected Progress progress = new Progress();
   protected SecretKey jobTokenSecret;
@@ -119,7 +119,7 @@ public abstract class MRTask extends AbstractLogicalIOProcessor {
   protected MRTaskReporter mrReporter;
   protected boolean useNewApi;
 
-  public MRTask(TezProcessorContext processorContext, boolean isMap) {
+  public MRTask(ProcessorContext processorContext, boolean isMap) {
     super(processorContext);
     this.isMap = isMap;
   }
@@ -307,7 +307,7 @@ public abstract class MRTask extends AbstractLogicalIOProcessor {
     }
   }
 
-  public TezProcessorContext getUmbilical() {
+  public ProcessorContext getUmbilical() {
     return this.processorContext;
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTaskReporter.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTaskReporter.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTaskReporter.java
index c3f7bc9..2fa75bf 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTaskReporter.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTaskReporter.java
@@ -26,10 +26,10 @@ import org.apache.hadoop.mapred.Reporter;
 import org.apache.tez.common.counters.TezCounter;
 import org.apache.tez.mapreduce.hadoop.mapred.MRCounters;
 import org.apache.tez.mapreduce.hadoop.mapred.MRReporter;
-import org.apache.tez.runtime.api.TezInputContext;
-import org.apache.tez.runtime.api.TezOutputContext;
-import org.apache.tez.runtime.api.TezProcessorContext;
-import org.apache.tez.runtime.api.TezTaskContext;
+import org.apache.tez.runtime.api.InputContext;
+import org.apache.tez.runtime.api.OutputContext;
+import org.apache.tez.runtime.api.ProcessorContext;
+import org.apache.tez.runtime.api.TaskContext;
 
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
@@ -37,25 +37,25 @@ public class MRTaskReporter
     extends org.apache.hadoop.mapreduce.StatusReporter
     implements Reporter {
 
-  private final TezTaskContext context;
+  private final TaskContext context;
   private final boolean isProcessorContext;
   private final MRReporter reporter;
 
   private InputSplit split = null;
 
-  public MRTaskReporter(TezProcessorContext context) {
+  public MRTaskReporter(ProcessorContext context) {
     this.context = context;
     this.reporter = new MRReporter(context.getCounters());
     this.isProcessorContext = true;
   }
 
-  public MRTaskReporter(TezOutputContext context) {
+  public MRTaskReporter(OutputContext context) {
     this.context = context;
     this.reporter = new MRReporter(context.getCounters());
     this.isProcessorContext = false;
   }
   
-  public MRTaskReporter(TezInputContext context) {
+  public MRTaskReporter(InputContext context) {
     this.context= context;
     this.reporter = new MRReporter(context.getCounters());
     this.isProcessorContext = false;
@@ -64,7 +64,7 @@ public class MRTaskReporter
   public void setProgress(float progress) {
     reporter.setProgress(progress);
     if (isProcessorContext) {
-      ((TezProcessorContext)context).setProgress(progress);
+      ((ProcessorContext)context).setProgress(progress);
     } else {
       // TODO FIXME NEWTEZ - will MROutput's reporter use this api?
     }

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/SimpleMRProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/SimpleMRProcessor.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/SimpleMRProcessor.java
index e2a900a..7be2407 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/SimpleMRProcessor.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/SimpleMRProcessor.java
@@ -24,7 +24,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tez.mapreduce.output.MROutput;
 import org.apache.tez.runtime.api.LogicalOutput;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.library.processor.SimpleProcessor;
 
 import com.google.common.collect.Lists;
@@ -32,7 +32,7 @@ import com.google.common.collect.Lists;
 public abstract class SimpleMRProcessor extends SimpleProcessor {
   private static final Log LOG = LogFactory.getLog(SimpleMRProcessor.class);
 
-  public SimpleMRProcessor(TezProcessorContext context) {
+  public SimpleMRProcessor(ProcessorContext context) {
     super(context);
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java
index 0b6dfc0..f0010a0 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/map/MapProcessor.java
@@ -46,7 +46,7 @@ import org.apache.tez.mapreduce.processor.MRTaskReporter;
 import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.LogicalInput;
 import org.apache.tez.runtime.api.LogicalOutput;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.library.api.KeyValueReader;
 import org.apache.tez.runtime.library.api.KeyValueWriter;
 import org.apache.tez.runtime.library.output.OnFileSortedOutput;
@@ -56,7 +56,7 @@ public class MapProcessor extends MRTask{
 
   private static final Log LOG = LogFactory.getLog(MapProcessor.class);
 
-  public MapProcessor(TezProcessorContext processorContext) {
+  public MapProcessor(ProcessorContext processorContext) {
     super(processorContext, true);
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java
index 41954f5..e1a5b8a 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java
@@ -44,7 +44,7 @@ import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.Input;
 import org.apache.tez.runtime.api.LogicalInput;
 import org.apache.tez.runtime.api.LogicalOutput;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.library.api.KeyValueWriter;
 import org.apache.tez.runtime.library.api.KeyValuesReader;
 import org.apache.tez.runtime.library.common.ConfigUtils;
@@ -61,7 +61,7 @@ public class ReduceProcessor extends MRTask {
   private Counter reduceInputKeyCounter;
   private Counter reduceInputValueCounter;
 
-  public ReduceProcessor(TezProcessorContext processorContext) {
+  public ReduceProcessor(ProcessorContext processorContext) {
     super(processorContext, false);
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/common/TestMRInputSplitDistributor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/common/TestMRInputSplitDistributor.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/common/TestMRInputSplitDistributor.java
index 5573d77..68a5fa4 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/common/TestMRInputSplitDistributor.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/common/TestMRInputSplitDistributor.java
@@ -40,9 +40,9 @@ import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRInputUserPayloadProto;
 import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRSplitProto;
 import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRSplitsProto;
 import org.apache.tez.runtime.api.Event;
-import org.apache.tez.runtime.api.TezRootInputInitializerContext;
-import org.apache.tez.runtime.api.events.RootInputDataInformationEvent;
-import org.apache.tez.runtime.api.events.RootInputUpdatePayloadEvent;
+import org.apache.tez.runtime.api.InputInitializerContext;
+import org.apache.tez.runtime.api.events.InputDataInformationEvent;
+import org.apache.tez.runtime.api.events.InputUpdatePayloadEvent;
 import org.junit.Test;
 
 import com.google.protobuf.ByteString;
@@ -67,18 +67,18 @@ public class TestMRInputSplitDistributor {
     payloadProto.setConfigurationBytes(confByteString);
     byte[] userPayload = payloadProto.build().toByteArray();
 
-    TezRootInputInitializerContext context = new TezRootInputInitializerContextForTest(userPayload);
+    InputInitializerContext context = new TezRootInputInitializerContextForTest(userPayload);
     MRInputSplitDistributor splitDist = new MRInputSplitDistributor(context);
 
     List<Event> events = splitDist.initialize();
 
     assertEquals(3, events.size());
-    assertTrue(events.get(0) instanceof RootInputUpdatePayloadEvent);
-    assertTrue(events.get(1) instanceof RootInputDataInformationEvent);
-    assertTrue(events.get(2) instanceof RootInputDataInformationEvent);
+    assertTrue(events.get(0) instanceof InputUpdatePayloadEvent);
+    assertTrue(events.get(1) instanceof InputDataInformationEvent);
+    assertTrue(events.get(2) instanceof InputDataInformationEvent);
 
-    RootInputDataInformationEvent diEvent1 = (RootInputDataInformationEvent) (events.get(1));
-    RootInputDataInformationEvent diEvent2 = (RootInputDataInformationEvent) (events.get(2));
+    InputDataInformationEvent diEvent1 = (InputDataInformationEvent) (events.get(1));
+    InputDataInformationEvent diEvent2 = (InputDataInformationEvent) (events.get(2));
 
     assertNull(diEvent1.getDeserializedUserPayload());
     assertNull(diEvent2.getDeserializedUserPayload());
@@ -115,18 +115,18 @@ public class TestMRInputSplitDistributor {
     payloadProto.setConfigurationBytes(confByteString);
     byte[] userPayload = payloadProto.build().toByteArray();
 
-    TezRootInputInitializerContext context = new TezRootInputInitializerContextForTest(userPayload);
+    InputInitializerContext context = new TezRootInputInitializerContextForTest(userPayload);
     MRInputSplitDistributor splitDist = new MRInputSplitDistributor(context);
 
     List<Event> events = splitDist.initialize();
 
     assertEquals(3, events.size());
-    assertTrue(events.get(0) instanceof RootInputUpdatePayloadEvent);
-    assertTrue(events.get(1) instanceof RootInputDataInformationEvent);
-    assertTrue(events.get(2) instanceof RootInputDataInformationEvent);
+    assertTrue(events.get(0) instanceof InputUpdatePayloadEvent);
+    assertTrue(events.get(1) instanceof InputDataInformationEvent);
+    assertTrue(events.get(2) instanceof InputDataInformationEvent);
 
-    RootInputDataInformationEvent diEvent1 = (RootInputDataInformationEvent) (events.get(1));
-    RootInputDataInformationEvent diEvent2 = (RootInputDataInformationEvent) (events.get(2));
+    InputDataInformationEvent diEvent1 = (InputDataInformationEvent) (events.get(1));
+    InputDataInformationEvent diEvent2 = (InputDataInformationEvent) (events.get(2));
 
     assertNull(diEvent1.getUserPayload());
     assertNull(diEvent2.getUserPayload());
@@ -142,7 +142,7 @@ public class TestMRInputSplitDistributor {
   }
 
   private static class TezRootInputInitializerContextForTest implements
-      TezRootInputInitializerContext {
+      InputInitializerContext {
 
     private final ApplicationId appId;
     private final byte[] payload;


Mime
View raw message