tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bi...@apache.org
Subject [2/5] TEZ-1237. Consolidate naming of API classes (bikas)
Date Mon, 11 Aug 2014 17:59:07 GMT
http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java
index 12c0a88..9af5a74 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java
@@ -48,8 +48,8 @@ import org.apache.tez.mapreduce.hadoop.MRHelpers;
 import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRInputUserPayloadProto;
 import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRSplitProto;
 import org.apache.tez.runtime.api.Event;
-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 org.junit.Before;
 import org.junit.Test;
@@ -94,7 +94,7 @@ public class TestMultiMRInput {
     builder.setConfigurationBytes(TezUtils.createByteStringFromConf(jobConf));
     byte[] payload = builder.build().toByteArray();
 
-    TezInputContext inputContext = createTezInputContext(payload);
+    InputContext inputContext = createTezInputContext(payload);
 
     MultiMRInput input = new MultiMRInput(inputContext, 1);
     input.initialize();
@@ -109,7 +109,7 @@ public class TestMultiMRInput {
     assertEquals(1, splits.length);
 
     MRSplitProto splitProto = MRHelpers.createSplitProto(splits[0]);
-    RootInputDataInformationEvent event = new RootInputDataInformationEvent(0,
+    InputDataInformationEvent event = new InputDataInformationEvent(0,
         splitProto.toByteArray());
 
     eventList.clear();
@@ -144,7 +144,7 @@ public class TestMultiMRInput {
     builder.setConfigurationBytes(TezUtils.createByteStringFromConf(jobConf));
     byte[] payload = builder.build().toByteArray();
 
-    TezInputContext inputContext = createTezInputContext(payload);
+    InputContext inputContext = createTezInputContext(payload);
 
     MultiMRInput input = new MultiMRInput(inputContext, 2);
     input.initialize();
@@ -169,11 +169,11 @@ public class TestMultiMRInput {
     assertEquals(2, splits.length);
 
     MRSplitProto splitProto1 = MRHelpers.createSplitProto(splits[0]);
-    RootInputDataInformationEvent event1 = new RootInputDataInformationEvent(0,
+    InputDataInformationEvent event1 = new InputDataInformationEvent(0,
         splitProto1.toByteArray());
 
     MRSplitProto splitProto2 = MRHelpers.createSplitProto(splits[1]);
-    RootInputDataInformationEvent event2 = new RootInputDataInformationEvent(0,
+    InputDataInformationEvent event2 = new InputDataInformationEvent(0,
         splitProto2.toByteArray());
 
     eventList.clear();
@@ -208,7 +208,7 @@ public class TestMultiMRInput {
     builder.setConfigurationBytes(TezUtils.createByteStringFromConf(jobConf));
     byte[] payload = builder.build().toByteArray();
 
-    TezInputContext inputContext = createTezInputContext(payload);
+    InputContext inputContext = createTezInputContext(payload);
 
     MultiMRInput input = new MultiMRInput(inputContext, 1);
     input.initialize();
@@ -222,9 +222,9 @@ public class TestMultiMRInput {
     assertEquals(1, splits.length);
 
     MRSplitProto splitProto = MRHelpers.createSplitProto(splits[0]);
-    RootInputDataInformationEvent event1 = new RootInputDataInformationEvent(0,
+    InputDataInformationEvent event1 = new InputDataInformationEvent(0,
         splitProto.toByteArray());
-    RootInputDataInformationEvent event2 = new RootInputDataInformationEvent(1,
+    InputDataInformationEvent event2 = new InputDataInformationEvent(1,
         splitProto.toByteArray());
 
     eventList.clear();
@@ -239,11 +239,11 @@ public class TestMultiMRInput {
     }
   }
 
-  private TezInputContext createTezInputContext(byte[] payload) {
+  private InputContext createTezInputContext(byte[] payload) {
     ApplicationId applicationId = ApplicationId.newInstance(10000, 1);
     TezCounters counters = new TezCounters();
 
-    TezInputContext inputContext = mock(TezInputContext.class);
+    InputContext inputContext = mock(InputContext.class);
     doReturn(applicationId).when(inputContext).getApplicationId();
     doReturn(counters).when(inputContext).getCounters();
     doReturn(1).when(inputContext).getDAGAttemptNumber();

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java
index f017436..41a2c81 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java
@@ -43,7 +43,7 @@ import org.apache.tez.mapreduce.input.MRInputLegacy;
 import org.apache.tez.mapreduce.partition.MRPartitioner;
 import org.apache.tez.mapreduce.processor.MapUtils;
 import org.apache.tez.runtime.LogicalIOProcessorRuntimeTask;
-import org.apache.tez.runtime.api.TezInputContext;
+import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.api.impl.InputSpec;
 import org.apache.tez.runtime.api.impl.OutputSpec;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
@@ -137,7 +137,7 @@ public class TestMapProcessor {
     task.run();
     task.close();
     
-    TezInputContext inputContext = task.getInputContexts().iterator().next();
+    InputContext inputContext = task.getInputContexts().iterator().next();
     TezTaskOutput mapOutputs = new TezLocalTaskOutputFiles(jobConf, inputContext.getUniqueIdentifier());
     
     

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-internals/src/main/java/org/apache/tez/common/ProtoConverters.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/common/ProtoConverters.java b/tez-runtime-internals/src/main/java/org/apache/tez/common/ProtoConverters.java
index 33dd1ee..803d9e2 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/common/ProtoConverters.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/common/ProtoConverters.java
@@ -22,8 +22,8 @@ import com.google.protobuf.ByteString;
 import org.apache.tez.runtime.api.events.CompositeDataMovementEvent;
 import org.apache.tez.runtime.api.events.DataMovementEvent;
 import org.apache.tez.runtime.api.events.EventProtos;
-import org.apache.tez.runtime.api.events.RootInputDataInformationEvent;
-import org.apache.tez.runtime.api.events.RootInputInitializerEvent;
+import org.apache.tez.runtime.api.events.InputDataInformationEvent;
+import org.apache.tez.runtime.api.events.InputInitializerEvent;
 
 public class ProtoConverters {
 
@@ -69,7 +69,7 @@ public class ProtoConverters {
   }
 
   public static EventProtos.RootInputDataInformationEventProto
-      convertRootInputDataInformationEventToProto(RootInputDataInformationEvent event) {
+      convertRootInputDataInformationEventToProto(InputDataInformationEvent event) {
     EventProtos.RootInputDataInformationEventProto.Builder builder =
         EventProtos.RootInputDataInformationEventProto.newBuilder();
     builder.setSourceIndex(event.getSourceIndex());
@@ -80,10 +80,10 @@ public class ProtoConverters {
     return builder.build();
   }
 
-  public static RootInputDataInformationEvent
+  public static InputDataInformationEvent
       convertRootInputDataInformationEventFromProto(
       EventProtos.RootInputDataInformationEventProto proto) {
-    RootInputDataInformationEvent diEvent = new RootInputDataInformationEvent(
+    InputDataInformationEvent diEvent = new InputDataInformationEvent(
         proto.getSourceIndex(), proto.getUserPayload() != null ? proto.getUserPayload()
             .toByteArray() : null);
     diEvent.setTargetIndex(proto.getTargetIndex());
@@ -91,7 +91,7 @@ public class ProtoConverters {
   }
 
   public static EventProtos.RootInputInitializerEventProto convertRootInputInitializerEventToProto(
-      RootInputInitializerEvent event) {
+      InputInitializerEvent event) {
     EventProtos.RootInputInitializerEventProto.Builder builder =
         EventProtos.RootInputInitializerEventProto.newBuilder();
     builder.setTargetVertexName(event.getTargetVertexName());
@@ -103,10 +103,10 @@ public class ProtoConverters {
     return builder.build();
   }
 
-  public static RootInputInitializerEvent convertRootInputInitializerEventFromProto(
+  public static InputInitializerEvent convertRootInputInitializerEventFromProto(
       EventProtos.RootInputInitializerEventProto proto) {
-    RootInputInitializerEvent event =
-        new RootInputInitializerEvent(proto.getTargetVertexName(), proto.getTargetInputName(),
+    InputInitializerEvent event =
+        new InputInitializerEvent(proto.getTargetVertexName(), proto.getTargetInputName(),
             (proto.hasUserPayload() ? proto.getUserPayload().toByteArray() : null),
             proto.getVersion());
     return event;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
index 92a0f07..a11a7e1 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
@@ -60,10 +60,10 @@ import org.apache.tez.runtime.api.MergedLogicalInput;
 import org.apache.tez.runtime.api.Output;
 import org.apache.tez.runtime.api.OutputFrameworkInterface;
 import org.apache.tez.runtime.api.Processor;
-import org.apache.tez.runtime.api.TezInputContext;
-import org.apache.tez.runtime.api.TezMergedInputContext;
-import org.apache.tez.runtime.api.TezOutputContext;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.InputContext;
+import org.apache.tez.runtime.api.MergedInputContext;
+import org.apache.tez.runtime.api.OutputContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.api.impl.EventMetaData;
 import org.apache.tez.runtime.api.impl.EventMetaData.EventProducerConsumerType;
 import org.apache.tez.runtime.api.impl.GroupInputSpec;
@@ -96,18 +96,18 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
   /** Responsible for maintaining order of Inputs */
   private final List<InputSpec> inputSpecs;
   private final ConcurrentHashMap<String, LogicalInput> inputsMap;
-  private final ConcurrentHashMap<String, TezInputContext> inputContextMap;
+  private final ConcurrentHashMap<String, InputContext> inputContextMap;
   /** Responsible for maintaining order of Outputs */
   private final List<OutputSpec> outputSpecs;
   private final ConcurrentHashMap<String, LogicalOutput> outputsMap;
-  private final ConcurrentHashMap<String, TezOutputContext> outputContextMap;
+  private final ConcurrentHashMap<String, OutputContext> outputContextMap;
 
   private final List<GroupInputSpec> groupInputSpecs;
   private ConcurrentHashMap<String, MergedLogicalInput> groupInputsMap;
 
   private final ProcessorDescriptor processorDescriptor;
   private AbstractLogicalIOProcessor processor;
-  private TezProcessorContext processorContext;
+  private ProcessorContext processorContext;
 
   private final MemoryDistributor initialMemoryDistributor;
 
@@ -146,10 +146,10 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
     this.localDirs = localDirs;
     this.inputSpecs = taskSpec.getInputs();
     this.inputsMap = new ConcurrentHashMap<String, LogicalInput>(numInputs);
-    this.inputContextMap = new ConcurrentHashMap<String, TezInputContext>(numInputs);
+    this.inputContextMap = new ConcurrentHashMap<String, InputContext>(numInputs);
     this.outputSpecs = taskSpec.getOutputs();
     this.outputsMap = new ConcurrentHashMap<String, LogicalOutput>(numOutputs);
-    this.outputContextMap = new ConcurrentHashMap<String, TezOutputContext>(numOutputs);
+    this.outputContextMap = new ConcurrentHashMap<String, OutputContext>(numOutputs);
 
     this.runInputMap = new LinkedHashMap<String, LogicalInput>();
     this.runOutputMap = new LinkedHashMap<String, LogicalOutput>();
@@ -372,7 +372,7 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
     public Void call() throws Exception {
       LOG.info("Initializing Input using InputSpec: " + inputSpec);
       String edgeName = inputSpec.getSourceVertexName();
-      TezInputContext inputContext = createInputContext(inputsMap, inputSpec, inputIndex);
+      InputContext inputContext = createInputContext(inputsMap, inputSpec, inputIndex);
       LogicalInput input = createInput(inputSpec, inputContext);
 
       inputsMap.put(edgeName, input);
@@ -420,7 +420,7 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
     public Void call() throws Exception {
       LOG.info("Initializing Output using OutputSpec: " + outputSpec);
       String edgeName = outputSpec.getDestinationVertexName();
-      TezOutputContext outputContext = createOutputContext(outputSpec, outputIndex);
+      OutputContext outputContext = createOutputContext(outputSpec, outputIndex);
       LogicalOutput output = createOutput(outputSpec, outputContext);
 
       outputsMap.put(edgeName, output);
@@ -449,7 +449,7 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
      groupInputsMap = new ConcurrentHashMap<String, MergedLogicalInput>(groupInputSpecs.size());
      for (GroupInputSpec groupInputSpec : groupInputSpecs) {
         LOG.info("Initializing GroupInput using GroupInputSpec: " + groupInputSpec);
-       TezMergedInputContext mergedInputContext =
+       MergedInputContext mergedInputContext =
            new TezMergedInputContextImpl(groupInputSpec.getMergedInputDescriptor().getUserPayload(),
                groupInputSpec.getGroupName(), groupInputsMap, inputReadyTracker, localDirs);
        List<Input> inputs = Lists.newArrayListWithCapacity(groupInputSpec.getGroupVertices().size());
@@ -474,9 +474,9 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
         + processorDescriptor.getClassName());
   }
 
-  private TezInputContext createInputContext(Map<String, LogicalInput> inputMap,
+  private InputContext createInputContext(Map<String, LogicalInput> inputMap,
                                              InputSpec inputSpec, int inputIndex) {
-    TezInputContext inputContext = new TezInputContextImpl(tezConf, localDirs,
+    InputContext inputContext = new TezInputContextImpl(tezConf, localDirs,
         appAttemptNumber, tezUmbilical,
         taskSpec.getDAGName(), taskSpec.getVertexName(),
         inputSpec.getSourceVertexName(), taskSpec.getTaskAttemptID(),
@@ -487,8 +487,8 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
     return inputContext;
   }
 
-  private TezOutputContext createOutputContext(OutputSpec outputSpec, int outputIndex) {
-    TezOutputContext outputContext = new TezOutputContextImpl(tezConf, localDirs,
+  private OutputContext createOutputContext(OutputSpec outputSpec, int outputIndex) {
+    OutputContext outputContext = new TezOutputContextImpl(tezConf, localDirs,
         appAttemptNumber, tezUmbilical,
         taskSpec.getDAGName(), taskSpec.getVertexName(),
         outputSpec.getDestinationVertexName(), taskSpec.getTaskAttemptID(),
@@ -499,8 +499,8 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
     return outputContext;
   }
 
-  private TezProcessorContext createProcessorContext() {
-    TezProcessorContext processorContext = new TezProcessorContextImpl(tezConf, localDirs,
+  private ProcessorContext createProcessorContext() {
+    ProcessorContext processorContext = new TezProcessorContextImpl(tezConf, localDirs,
         appAttemptNumber, tezUmbilical,
         taskSpec.getDAGName(), taskSpec.getVertexName(),
         taskSpec.getTaskAttemptID(),
@@ -510,11 +510,11 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
     return processorContext;
   }
 
-  private LogicalInput createInput(InputSpec inputSpec, TezInputContext inputContext) {
+  private LogicalInput createInput(InputSpec inputSpec, InputContext inputContext) {
     LOG.info("Creating Input");
     InputDescriptor inputDesc = inputSpec.getInputDescriptor();
     Input input = ReflectionUtils.createClazzInstance(inputDesc.getClassName(),
-        new Class[]{TezInputContext.class, Integer.TYPE},
+        new Class[]{InputContext.class, Integer.TYPE},
         new Object[]{inputContext, inputSpec.getPhysicalEdgeCount()});
     if (!(input instanceof LogicalInput)) {
       throw new TezUncheckedException(inputDesc.getClass().getName()
@@ -525,10 +525,10 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
   }
 
   private LogicalInput createMergedInput(InputDescriptor inputDesc,
-                                         TezMergedInputContext mergedInputContext,
+                                         MergedInputContext mergedInputContext,
                                          List<Input> constituentInputs) {
     LogicalInput input = ReflectionUtils.createClazzInstance(inputDesc.getClassName(),
-        new Class[]{TezMergedInputContext.class, List.class},
+        new Class[]{MergedInputContext.class, List.class},
         new Object[]{mergedInputContext, constituentInputs});
     if (!(input instanceof LogicalInput)) {
       throw new TezUncheckedException(inputDesc.getClass().getName()
@@ -538,11 +538,11 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
     return input;
   }
 
-  private LogicalOutput createOutput(OutputSpec outputSpec, TezOutputContext outputContext) {
+  private LogicalOutput createOutput(OutputSpec outputSpec, OutputContext outputContext) {
     LOG.info("Creating Output");
     OutputDescriptor outputDesc = outputSpec.getOutputDescriptor();
     Output output = ReflectionUtils.createClazzInstance(outputDesc.getClassName(),
-        new Class[]{TezOutputContext.class, Integer.TYPE},
+        new Class[]{OutputContext.class, Integer.TYPE},
         new Object[]{outputContext, outputSpec.getPhysicalEdgeCount()});
 
     if (!(output instanceof LogicalOutput)) {
@@ -554,9 +554,9 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
   }
 
   private AbstractLogicalIOProcessor createProcessor(
-      String processorClassName, TezProcessorContext processorContext) {
+      String processorClassName, ProcessorContext processorContext) {
     Processor processor = ReflectionUtils.createClazzInstance(processorClassName,
-        new Class[]{TezProcessorContext.class}, new Object[]{processorContext});
+        new Class[]{ProcessorContext.class}, new Object[]{processorContext});
     if (!(processor instanceof AbstractLogicalIOProcessor)) {
       throw new TezUncheckedException(processor.getClass().getName()
           + " is not a sub-type of AbstractLogicalIOProcessor."
@@ -695,19 +695,19 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
   
   @Private
   @VisibleForTesting
-  public Collection<TezInputContext> getInputContexts() {
+  public Collection<InputContext> getInputContexts() {
     return this.inputContextMap.values();
   }
   
   @Private
   @VisibleForTesting
-  public Collection<TezOutputContext> getOutputContexts() {
+  public Collection<OutputContext> getOutputContexts() {
     return this.outputContextMap.values();
   }
 
   @Private
   @VisibleForTesting
-  public TezProcessorContext getProcessorContext() {
+  public ProcessorContext getProcessorContext() {
     return this.processorContext;
   }
   

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezEvent.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezEvent.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezEvent.java
index 770fd89..fea1350 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezEvent.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezEvent.java
@@ -37,8 +37,8 @@ import org.apache.tez.runtime.api.events.EventProtos.RootInputDataInformationEve
 import org.apache.tez.runtime.api.events.EventProtos.VertexManagerEventProto;
 import org.apache.tez.runtime.api.events.InputFailedEvent;
 import org.apache.tez.runtime.api.events.InputReadErrorEvent;
-import org.apache.tez.runtime.api.events.RootInputDataInformationEvent;
-import org.apache.tez.runtime.api.events.RootInputInitializerEvent;
+import org.apache.tez.runtime.api.events.InputDataInformationEvent;
+import org.apache.tez.runtime.api.events.InputInitializerEvent;
 import org.apache.tez.runtime.api.events.TaskAttemptCompletedEvent;
 import org.apache.tez.runtime.api.events.TaskAttemptFailedEvent;
 import org.apache.tez.runtime.api.events.TaskStatusUpdateEvent;
@@ -80,9 +80,9 @@ public class TezEvent implements Writable {
       eventType = EventType.INPUT_FAILED_EVENT;
     } else if (event instanceof TaskStatusUpdateEvent) {
       eventType = EventType.TASK_STATUS_UPDATE_EVENT;
-    } else if (event instanceof RootInputDataInformationEvent) {
+    } else if (event instanceof InputDataInformationEvent) {
       eventType = EventType.ROOT_INPUT_DATA_INFORMATION_EVENT;
-    } else if (event instanceof RootInputInitializerEvent) {
+    } else if (event instanceof InputInitializerEvent) {
       eventType = EventType.ROOT_INPUT_INITIALIZER_EVENT;
     } else {
       throw new TezUncheckedException("Unknown event, event="
@@ -173,11 +173,11 @@ public class TezEvent implements Writable {
         break;
       case ROOT_INPUT_DATA_INFORMATION_EVENT:
         eventBytes = ProtoConverters.convertRootInputDataInformationEventToProto(
-            (RootInputDataInformationEvent) event).toByteArray();
+            (InputDataInformationEvent) event).toByteArray();
         break;
       case ROOT_INPUT_INITIALIZER_EVENT:
         eventBytes = ProtoConverters
-            .convertRootInputInitializerEventToProto((RootInputInitializerEvent) event)
+            .convertRootInputInitializerEventToProto((InputInitializerEvent) event)
             .toByteArray();
         break;
       default:

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezInputContextImpl.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezInputContextImpl.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezInputContextImpl.java
index 627e830..d39e5b3 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezInputContextImpl.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezInputContextImpl.java
@@ -41,13 +41,13 @@ import org.apache.tez.runtime.InputReadyTracker;
 import org.apache.tez.runtime.RuntimeTask;
 import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.LogicalInput;
-import org.apache.tez.runtime.api.TezInputContext;
+import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.api.impl.EventMetaData.EventProducerConsumerType;
 import org.apache.tez.runtime.common.objectregistry.ObjectRegistry;
 import org.apache.tez.runtime.common.resources.MemoryDistributor;
 
 public class TezInputContextImpl extends TezTaskContextImpl
-    implements TezInputContext {
+    implements InputContext {
 
   private final TezUserPayload userPayload;
   private final String sourceVertexName;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezMergedInputContextImpl.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezMergedInputContextImpl.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezMergedInputContextImpl.java
index cf55d39..f43282a 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezMergedInputContextImpl.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezMergedInputContextImpl.java
@@ -12,10 +12,10 @@ import org.apache.tez.dag.api.DagTypeConverters;
 import org.apache.tez.runtime.InputReadyTracker;
 import org.apache.tez.runtime.api.Input;
 import org.apache.tez.runtime.api.MergedLogicalInput;
-import org.apache.tez.runtime.api.TezMergedInputContext;
+import org.apache.tez.runtime.api.MergedInputContext;
 
 
-public class TezMergedInputContextImpl implements TezMergedInputContext {
+public class TezMergedInputContextImpl implements MergedInputContext {
 
   private final TezUserPayload userPayload;
   private final String groupInputName;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezOutputContextImpl.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezOutputContextImpl.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezOutputContextImpl.java
index cde4c0c..2d0d606 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezOutputContextImpl.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezOutputContextImpl.java
@@ -39,13 +39,13 @@ import org.apache.tez.dag.api.TezConfiguration;
 import org.apache.tez.dag.records.TezTaskAttemptID;
 import org.apache.tez.runtime.RuntimeTask;
 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.api.impl.EventMetaData.EventProducerConsumerType;
 import org.apache.tez.runtime.common.objectregistry.ObjectRegistry;
 import org.apache.tez.runtime.common.resources.MemoryDistributor;
 
 public class TezOutputContextImpl extends TezTaskContextImpl
-    implements TezOutputContext {
+    implements OutputContext {
 
   private final TezUserPayload userPayload;
   private final String destinationVertexName;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezProcessorContextImpl.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezProcessorContextImpl.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezProcessorContextImpl.java
index 9273cf3..a20036e 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezProcessorContextImpl.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezProcessorContextImpl.java
@@ -43,12 +43,12 @@ import org.apache.tez.runtime.InputReadyTracker;
 import org.apache.tez.runtime.RuntimeTask;
 import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.Input;
-import org.apache.tez.runtime.api.TezProcessorContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.api.impl.EventMetaData.EventProducerConsumerType;
 import org.apache.tez.runtime.common.objectregistry.ObjectRegistry;
 import org.apache.tez.runtime.common.resources.MemoryDistributor;
 
-public class TezProcessorContextImpl extends TezTaskContextImpl implements TezProcessorContext {
+public class TezProcessorContextImpl extends TezTaskContextImpl implements ProcessorContext {
 
   private static final Log LOG = LogFactory.getLog(TezProcessorContextImpl.class);
   

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezTaskContextImpl.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezTaskContextImpl.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezTaskContextImpl.java
index b155cbc..45aba9c 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezTaskContextImpl.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezTaskContextImpl.java
@@ -36,13 +36,13 @@ import org.apache.tez.dag.api.TezEntityDescriptor;
 import org.apache.tez.dag.records.TezTaskAttemptID;
 import org.apache.tez.runtime.RuntimeTask;
 import org.apache.tez.runtime.api.MemoryUpdateCallback;
-import org.apache.tez.runtime.api.TezTaskContext;
+import org.apache.tez.runtime.api.TaskContext;
 import org.apache.tez.runtime.common.objectregistry.ObjectRegistry;
 import org.apache.tez.runtime.common.resources.MemoryDistributor;
 
 import com.google.common.base.Preconditions;
 
-public abstract class TezTaskContextImpl implements TezTaskContext {
+public abstract class TezTaskContextImpl implements TaskContext {
 
   private static final AtomicInteger ID_GEN = new AtomicInteger(10000);
   

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/MemoryDistributor.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/MemoryDistributor.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/MemoryDistributor.java
index 2efafab..6d58635 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/MemoryDistributor.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/MemoryDistributor.java
@@ -35,10 +35,10 @@ import org.apache.tez.dag.api.TezConfiguration;
 import org.apache.tez.dag.api.TezEntityDescriptor;
 import org.apache.tez.dag.api.TezUncheckedException;
 import org.apache.tez.runtime.api.MemoryUpdateCallback;
-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;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
@@ -60,8 +60,8 @@ public class MemoryDistributor {
 
   private long totalJvmMemory;
   private final boolean isEnabled;
-  private final Set<TezTaskContext> dupSet = Collections
-      .newSetFromMap(new ConcurrentHashMap<TezTaskContext, Boolean>());
+  private final Set<TaskContext> dupSet = Collections
+      .newSetFromMap(new ConcurrentHashMap<TaskContext, Boolean>());
   private final List<RequestorInfo> requestList;
 
   /**
@@ -93,7 +93,7 @@ public class MemoryDistributor {
    * Used by the Tez framework to request memory on behalf of user requests.
    */
   public void requestMemory(long requestSize, MemoryUpdateCallback callback,
-      TezTaskContext taskContext, TezEntityDescriptor<?> descriptor) {
+      TaskContext taskContext, TezEntityDescriptor<?> descriptor) {
     registerRequest(requestSize, callback, taskContext, descriptor);
   }
   
@@ -154,7 +154,7 @@ public class MemoryDistributor {
   }
 
   private long registerRequest(long requestSize, MemoryUpdateCallback callback,
-      TezTaskContext entityContext, TezEntityDescriptor<?> descriptor) {
+      TaskContext entityContext, TezEntityDescriptor<?> descriptor) {
     Preconditions.checkArgument(requestSize >= 0);
     Preconditions.checkNotNull(callback);
     Preconditions.checkNotNull(entityContext);
@@ -210,19 +210,19 @@ public class MemoryDistributor {
     private final MemoryUpdateCallback callback;
     private final InitialMemoryRequestContext requestContext;
 
-    public RequestorInfo(TezTaskContext taskContext, long requestSize,
+    public RequestorInfo(TaskContext taskContext, long requestSize,
         final MemoryUpdateCallback callback, TezEntityDescriptor<?> descriptor) {
       InitialMemoryRequestContext.ComponentType type;
       String componentVertexName;
-      if (taskContext instanceof TezInputContext) {
+      if (taskContext instanceof InputContext) {
         type = InitialMemoryRequestContext.ComponentType.INPUT;
-        componentVertexName = ((TezInputContext) taskContext).getSourceVertexName();
-      } else if (taskContext instanceof TezOutputContext) {
+        componentVertexName = ((InputContext) taskContext).getSourceVertexName();
+      } else if (taskContext instanceof OutputContext) {
         type = InitialMemoryRequestContext.ComponentType.OUTPUT;
-        componentVertexName = ((TezOutputContext) taskContext).getDestinationVertexName();
-      } else if (taskContext instanceof TezProcessorContext) {
+        componentVertexName = ((OutputContext) taskContext).getDestinationVertexName();
+      } else if (taskContext instanceof ProcessorContext) {
         type = InitialMemoryRequestContext.ComponentType.PROCESSOR;
-        componentVertexName = ((TezProcessorContext) taskContext).getTaskVertexName();
+        componentVertexName = ((ProcessorContext) taskContext).getTaskVertexName();
       } else {
         throw new IllegalArgumentException("Unknown type of entityContext: "
             + taskContext.getClass().getName());

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestInputReadyTracker.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestInputReadyTracker.java b/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestInputReadyTracker.java
index 352d09c..49855f2 100644
--- a/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestInputReadyTracker.java
+++ b/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestInputReadyTracker.java
@@ -33,7 +33,7 @@ import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.Input;
 import org.apache.tez.runtime.api.MergedLogicalInput;
 import org.apache.tez.runtime.api.Reader;
-import org.apache.tez.runtime.api.TezMergedInputContext;
+import org.apache.tez.runtime.api.MergedInputContext;
 import org.apache.tez.runtime.api.impl.TezMergedInputContextImpl;
 import org.junit.Test;
 
@@ -156,8 +156,8 @@ public class TestInputReadyTracker {
     group2Inputs.add(input4);
 
     Map<String, MergedLogicalInput> mergedInputMap = new HashMap<String, MergedLogicalInput>();
-    TezMergedInputContext mergedInputContext1 = new TezMergedInputContextImpl(null, "group1", mergedInputMap, inputReadyTracker, null);
-    TezMergedInputContext mergedInputContext2 = new TezMergedInputContextImpl(null, "group2", mergedInputMap, inputReadyTracker, null);
+    MergedInputContext mergedInputContext1 = new TezMergedInputContextImpl(null, "group1", mergedInputMap, inputReadyTracker, null);
+    MergedInputContext mergedInputContext2 = new TezMergedInputContextImpl(null, "group2", mergedInputMap, inputReadyTracker, null);
 
     AnyOneMergedInputForTest group1 = new AnyOneMergedInputForTest(mergedInputContext1, group1Inputs);
     AllMergedInputForTest group2 = new AllMergedInputForTest(mergedInputContext2, group2Inputs);
@@ -291,7 +291,7 @@ public class TestInputReadyTracker {
 
     private volatile boolean isReady = false;
 
-    public AnyOneMergedInputForTest(TezMergedInputContext context, List<Input> inputs) {
+    public AnyOneMergedInputForTest(MergedInputContext context, List<Input> inputs) {
       super(context, inputs);
     }
 
@@ -312,7 +312,7 @@ public class TestInputReadyTracker {
     private volatile boolean isReady = false;
     private Set<Input> readyInputs = Sets.newHashSet();
 
-    public AllMergedInputForTest(TezMergedInputContext context, List<Input> inputs) {
+    public AllMergedInputForTest(MergedInputContext context, List<Input> inputs) {
       super(context, inputs);
     }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestLogicalIOProcessorRuntimeTask.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestLogicalIOProcessorRuntimeTask.java b/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestLogicalIOProcessorRuntimeTask.java
index 7740cb0..0429218 100644
--- a/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestLogicalIOProcessorRuntimeTask.java
+++ b/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestLogicalIOProcessorRuntimeTask.java
@@ -41,9 +41,9 @@ 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.Reader;
-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.InputContext;
+import org.apache.tez.runtime.api.OutputContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.apache.tez.runtime.api.Writer;
 import org.apache.tez.runtime.api.impl.InputSpec;
 import org.apache.tez.runtime.api.impl.OutputSpec;
@@ -142,7 +142,7 @@ public class TestLogicalIOProcessorRuntimeTask {
 
     public static volatile int runCount = 0;
 
-    public TestProcessor(TezProcessorContext context) {
+    public TestProcessor(ProcessorContext context) {
       super(context);
     }
 
@@ -172,7 +172,7 @@ public class TestLogicalIOProcessorRuntimeTask {
 
     public static volatile int startCount = 0;
 
-    public TestInput(TezInputContext inputContext, int numPhysicalInputs) {
+    public TestInput(InputContext inputContext, int numPhysicalInputs) {
       super(inputContext, numPhysicalInputs);
     }
 
@@ -209,7 +209,7 @@ public class TestLogicalIOProcessorRuntimeTask {
 
     public static volatile int startCount = 0;
 
-    public TestOutput(TezOutputContext outputContext, int numPhysicalOutputs) {
+    public TestOutput(OutputContext outputContext, int numPhysicalOutputs) {
       super(outputContext, numPhysicalOutputs);
     }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/resources/TestMemoryDistributor.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/resources/TestMemoryDistributor.java b/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/resources/TestMemoryDistributor.java
index 9d5f2e6..9b19264 100644
--- a/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/resources/TestMemoryDistributor.java
+++ b/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/resources/TestMemoryDistributor.java
@@ -29,9 +29,9 @@ import org.apache.tez.dag.api.OutputDescriptor;
 import org.apache.tez.dag.api.ProcessorDescriptor;
 import org.apache.tez.dag.api.TezConfiguration;
 import org.apache.tez.runtime.api.MemoryUpdateCallback;
-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.InputContext;
+import org.apache.tez.runtime.api.OutputContext;
+import org.apache.tez.runtime.api.ProcessorContext;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -54,19 +54,19 @@ public class TestMemoryDistributor {
 
     // First request
     MemoryUpdateCallbackForTest e1Callback = new MemoryUpdateCallbackForTest();
-    TezInputContext e1InputContext1 = createTestInputContext();
+    InputContext e1InputContext1 = createTestInputContext();
     InputDescriptor e1InDesc1 = createTestInputDescriptor();
     dist.requestMemory(10000, e1Callback, e1InputContext1, e1InDesc1);
     
     // Second request
     MemoryUpdateCallbackForTest e2Callback = new MemoryUpdateCallbackForTest();
-    TezInputContext e2InputContext2 = createTestInputContext();
+    InputContext e2InputContext2 = createTestInputContext();
     InputDescriptor e2InDesc2 = createTestInputDescriptor();
     dist.requestMemory(10000, e2Callback, e2InputContext2, e2InDesc2);
     
     // Third request - output
     MemoryUpdateCallbackForTest e3Callback = new MemoryUpdateCallbackForTest();
-    TezOutputContext e3OutputContext1 = createTestOutputContext();
+    OutputContext e3OutputContext1 = createTestOutputContext();
     OutputDescriptor e3OutDesc2 = createTestOutputDescriptor();
     dist.requestMemory(5000, e3Callback, e3OutputContext1, e3OutDesc2);
     
@@ -89,13 +89,13 @@ public class TestMemoryDistributor {
 
     // First request
     MemoryUpdateCallbackForTest e1Callback = new MemoryUpdateCallbackForTest();
-    TezInputContext e1InputContext1 = createTestInputContext();
+    InputContext e1InputContext1 = createTestInputContext();
     InputDescriptor e1InDesc1 = createTestInputDescriptor();
     dist.requestMemory(104857600l, e1Callback, e1InputContext1, e1InDesc1);
     
     // Second request
     MemoryUpdateCallbackForTest e2Callback = new MemoryUpdateCallbackForTest();
-    TezInputContext e2InputContext2 = createTestInputContext();
+    InputContext e2InputContext2 = createTestInputContext();
     InputDescriptor e2InDesc2 = createTestInputDescriptor();
     dist.requestMemory(157286400l, e2Callback, e2InputContext2, e2InDesc2);
     
@@ -113,25 +113,25 @@ public class TestMemoryDistributor {
 
     // First request
     MemoryUpdateCallbackForTest e1Callback = new MemoryUpdateCallbackForTest();
-    TezInputContext e1InputContext1 = createTestInputContext();
+    InputContext e1InputContext1 = createTestInputContext();
     InputDescriptor e1InDesc1 = createTestInputDescriptor();
     dist.requestMemory(10000, e1Callback, e1InputContext1, e1InDesc1);
     
     // Second request
     MemoryUpdateCallbackForTest e2Callback = new MemoryUpdateCallbackForTest();
-    TezInputContext e2InputContext2 = createTestInputContext();
+    InputContext e2InputContext2 = createTestInputContext();
     InputDescriptor e2InDesc2 = createTestInputDescriptor();
     dist.requestMemory(10000, e2Callback, e2InputContext2, e2InDesc2);
     
     // Third request - output
     MemoryUpdateCallbackForTest e3Callback = new MemoryUpdateCallbackForTest();
-    TezOutputContext e3OutputContext1 = createTestOutputContext();
+    OutputContext e3OutputContext1 = createTestOutputContext();
     OutputDescriptor e3OutDesc1 = createTestOutputDescriptor();
     dist.requestMemory(5000, e3Callback, e3OutputContext1, e3OutDesc1);
     
     // Fourth request - processor
     MemoryUpdateCallbackForTest e4Callback = new MemoryUpdateCallbackForTest();
-    TezProcessorContext e4ProcessorContext1 = createTestProcessortContext();
+    ProcessorContext e4ProcessorContext1 = createTestProcessortContext();
     ProcessorDescriptor e4ProcessorDesc1 = createTestProcessorDescriptor();
     dist.requestMemory(5000, e4Callback, e4ProcessorContext1, e4ProcessorDesc1);
     
@@ -158,13 +158,13 @@ public class TestMemoryDistributor {
 
     // First request
     MemoryUpdateCallbackForTest e1Callback = new MemoryUpdateCallbackForTest();
-    TezInputContext e1InputContext1 = createTestInputContext();
+    InputContext e1InputContext1 = createTestInputContext();
     InputDescriptor e1InDesc1 = createTestInputDescriptor();
     dist.requestMemory(104857600l, e1Callback, e1InputContext1, e1InDesc1);
     
     // Second request
     MemoryUpdateCallbackForTest e2Callback = new MemoryUpdateCallbackForTest();
-    TezInputContext e2InputContext2 = createTestInputContext();
+    InputContext e2InputContext2 = createTestInputContext();
     InputDescriptor e2InDesc2 = createTestInputDescriptor();
     dist.requestMemory(144965632l, e2Callback, e2InputContext2, e2InDesc2);
     
@@ -184,19 +184,19 @@ public class TestMemoryDistributor {
 
     // First request
     MemoryUpdateCallbackForTest e1Callback = new MemoryUpdateCallbackForTest();
-    TezInputContext e1InputContext1 = createTestInputContext();
+    InputContext e1InputContext1 = createTestInputContext();
     InputDescriptor e1InDesc1 = createTestInputDescriptor();
     dist.requestMemory(10000, e1Callback, e1InputContext1, e1InDesc1);
     
     // Second request
     MemoryUpdateCallbackForTest e2Callback = new MemoryUpdateCallbackForTest();
-    TezInputContext e2InputContext2 = createTestInputContext();
+    InputContext e2InputContext2 = createTestInputContext();
     InputDescriptor e2InDesc2 = createTestInputDescriptor();
     dist.requestMemory(10000, e2Callback, e2InputContext2, e2InDesc2);
     
     // Third request - output
     MemoryUpdateCallbackForTest e3Callback = new MemoryUpdateCallbackForTest();
-    TezOutputContext e3OutputContext1 = createTestOutputContext();
+    OutputContext e3OutputContext1 = createTestOutputContext();
     OutputDescriptor e3OutDesc2 = createTestOutputDescriptor();
     dist.requestMemory(5000, e3Callback, e3OutputContext1, e3OutDesc2);
     
@@ -239,22 +239,22 @@ public class TestMemoryDistributor {
     return desc;
   }
 
-  protected TezInputContext createTestInputContext() {
-    TezInputContext context = mock(TezInputContext.class);
+  protected InputContext createTestInputContext() {
+    InputContext context = mock(InputContext.class);
     doReturn("input").when(context).getSourceVertexName();
     doReturn("task").when(context).getTaskVertexName();
     return context;
   }
   
-  protected TezOutputContext createTestOutputContext() {
-    TezOutputContext context = mock(TezOutputContext.class);
+  protected OutputContext createTestOutputContext() {
+    OutputContext context = mock(OutputContext.class);
     doReturn("output").when(context).getDestinationVertexName();
     doReturn("task").when(context).getTaskVertexName();
     return context;
   }
   
-  protected TezProcessorContext createTestProcessortContext() {
-    TezProcessorContext context = mock(TezProcessorContext.class);
+  protected ProcessorContext createTestProcessortContext() {
+    ProcessorContext context = mock(ProcessorContext.class);
     doReturn("task").when(context).getTaskVertexName();
     return context;
   }

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/dag/library/vertexmanager/ShuffleVertexManager.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/dag/library/vertexmanager/ShuffleVertexManager.java b/tez-runtime-library/src/main/java/org/apache/tez/dag/library/vertexmanager/ShuffleVertexManager.java
index 83c96e6..d171365 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/dag/library/vertexmanager/ShuffleVertexManager.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/dag/library/vertexmanager/ShuffleVertexManager.java
@@ -30,9 +30,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.tez.common.TezUtils;
-import org.apache.tez.dag.api.EdgeManager;
-import org.apache.tez.dag.api.EdgeManagerContext;
-import org.apache.tez.dag.api.EdgeManagerDescriptor;
+import org.apache.tez.dag.api.EdgeManagerPlugin;
+import org.apache.tez.dag.api.EdgeManagerPluginContext;
+import org.apache.tez.dag.api.EdgeManagerPluginDescriptor;
 import org.apache.tez.dag.api.EdgeProperty;
 import org.apache.tez.dag.api.InputDescriptor;
 import org.apache.tez.dag.api.TezUncheckedException;
@@ -125,14 +125,14 @@ public class ShuffleVertexManager extends VertexManagerPlugin {
     super(context);
   }
 
-  public static class CustomShuffleEdgeManager extends EdgeManager {
+  public static class CustomShuffleEdgeManager extends EdgeManagerPlugin {
     int numSourceTaskOutputs;
     int numDestinationTasks;
     int basePartitionRange;
     int remainderRangeForLastShuffler;
     int numSourceTasks;
 
-    public CustomShuffleEdgeManager(EdgeManagerContext context) {
+    public CustomShuffleEdgeManager(EdgeManagerPluginContext context) {
       super(context);
     }
 
@@ -419,8 +419,8 @@ public class ShuffleVertexManager extends VertexManagerPlugin {
           
     if(finalTaskParallelism < currentParallelism) {
       // final parallelism is less than actual parallelism
-      Map<String, EdgeManagerDescriptor> edgeManagers =
-          new HashMap<String, EdgeManagerDescriptor>(bipartiteSources.size());
+      Map<String, EdgeManagerPluginDescriptor> edgeManagers =
+          new HashMap<String, EdgeManagerPluginDescriptor>(bipartiteSources.size());
       for(String vertex : bipartiteSources.keySet()) {
         // use currentParallelism for numSourceTasks to maintain original state
         // for the source tasks
@@ -430,8 +430,8 @@ public class ShuffleVertexManager extends VertexManagerPlugin {
                 getContext().getVertexNumTasks(vertex), basePartitionRange,
                 ((remainderRangeForLastShuffler > 0) ?
                     remainderRangeForLastShuffler : basePartitionRange));
-        EdgeManagerDescriptor edgeManagerDescriptor =
-            new EdgeManagerDescriptor(CustomShuffleEdgeManager.class.getName());
+        EdgeManagerPluginDescriptor edgeManagerDescriptor =
+            new EdgeManagerPluginDescriptor(CustomShuffleEdgeManager.class.getName());
         edgeManagerDescriptor.setUserPayload(edgeManagerConfig.toUserPayload());
         edgeManagers.put(vertex, edgeManagerDescriptor);
       }

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/broadcast/output/FileBasedKVWriter.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/broadcast/output/FileBasedKVWriter.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/broadcast/output/FileBasedKVWriter.java
index 5f48739..3ce8a8a 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/broadcast/output/FileBasedKVWriter.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/broadcast/output/FileBasedKVWriter.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.io.compress.DefaultCodec;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.tez.common.counters.TaskCounter;
 import org.apache.tez.common.counters.TezCounter;
-import org.apache.tez.runtime.api.TezOutputContext;
+import org.apache.tez.runtime.api.OutputContext;
 import org.apache.tez.runtime.library.api.KeyValuesWriter;
 import org.apache.tez.runtime.library.common.ConfigUtils;
 import org.apache.tez.runtime.library.common.TezRuntimeUtils;
@@ -82,7 +82,7 @@ public class FileBasedKVWriter extends KeyValuesWriter {
   // Time waiting for a write to complete, if that's possible.
   // Size of key-value pairs written.
 
-  public FileBasedKVWriter(TezOutputContext outputContext, Configuration conf) throws IOException {
+  public FileBasedKVWriter(OutputContext outputContext, Configuration conf) throws IOException {
     this.conf = conf;
 
     this.outputRecordsCounter = outputContext.getCounters().findCounter(TaskCounter.OUTPUT_RECORDS);

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/TezRuntimeUtils.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/TezRuntimeUtils.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/TezRuntimeUtils.java
index ae7bd30..17865ea 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/TezRuntimeUtils.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/TezRuntimeUtils.java
@@ -26,8 +26,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.tez.dag.api.TezUncheckedException;
-import org.apache.tez.runtime.api.TezOutputContext;
-import org.apache.tez.runtime.api.TezTaskContext;
+import org.apache.tez.runtime.api.OutputContext;
+import org.apache.tez.runtime.api.TaskContext;
 import org.apache.tez.runtime.library.api.Partitioner;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
 import org.apache.tez.runtime.library.common.combine.Combiner;
@@ -56,7 +56,7 @@ public class TezRuntimeUtils {
   }
 
   @SuppressWarnings("unchecked")
-  public static Combiner instantiateCombiner(Configuration conf, TezTaskContext taskContext) throws IOException {
+  public static Combiner instantiateCombiner(Configuration conf, TaskContext taskContext) throws IOException {
     Class<? extends Combiner> clazz;
     String className = conf.get(TezRuntimeConfiguration.TEZ_RUNTIME_COMBINER_CLASS);
     if (className == null) {
@@ -74,7 +74,7 @@ public class TezRuntimeUtils {
     
       Constructor<? extends Combiner> ctor;
       try {
-        ctor = clazz.getConstructor(TezTaskContext.class);
+        ctor = clazz.getConstructor(TaskContext.class);
         combiner = ctor.newInstance(taskContext);
       } catch (SecurityException e) {
         throw new IOException(e);
@@ -135,7 +135,7 @@ public class TezRuntimeUtils {
     return partitioner;
   }
   
-  public static TezTaskOutput instantiateTaskOutputManager(Configuration conf, TezOutputContext outputContext) {
+  public static TezTaskOutput instantiateTaskOutputManager(Configuration conf, OutputContext outputContext) {
     Class<?> clazz = conf.getClass(Constants.TEZ_RUNTIME_TASK_OUTPUT_MANAGER,
         TezTaskOutputFiles.class);
     try {

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/localshuffle/LocalShuffle.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/localshuffle/LocalShuffle.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/localshuffle/LocalShuffle.java
index 252d321..383f027 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/localshuffle/LocalShuffle.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/localshuffle/LocalShuffle.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.io.compress.DefaultCodec;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.tez.common.counters.TaskCounter;
 import org.apache.tez.common.counters.TezCounter;
-import org.apache.tez.runtime.api.TezInputContext;
+import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
 import org.apache.tez.runtime.library.common.ConfigUtils;
 import org.apache.tez.runtime.library.common.sort.impl.TezMerger;
@@ -44,7 +44,7 @@ public class LocalShuffle {
 
   // TODO NEWTEZ This is broken.
 
-  private final TezInputContext inputContext;
+  private final InputContext inputContext;
   private final Configuration conf;
   private final int numInputs;
 
@@ -63,7 +63,7 @@ public class LocalShuffle {
   private final int ifileReadAheadLength;
   private final int ifileBufferSize;
 
-  public LocalShuffle(TezInputContext inputContext, Configuration conf, int numInputs) throws IOException {
+  public LocalShuffle(InputContext inputContext, Configuration conf, int numInputs) throws IOException {
     this.inputContext = inputContext;
     this.conf = conf;
     this.numInputs = numInputs;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Fetcher.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Fetcher.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Fetcher.java
index e5913e5..adfa060 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Fetcher.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Fetcher.java
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.io.compress.CompressionCodec;
 import org.apache.tez.common.TezUtils;
 import org.apache.tez.common.counters.TezCounter;
-import org.apache.tez.runtime.api.TezInputContext;
+import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.library.common.InputAttemptIdentifier;
 import org.apache.tez.runtime.library.common.shuffle.impl.MapOutput.Type;
 import org.apache.tez.runtime.library.shuffle.common.HttpConnection;
@@ -85,7 +85,7 @@ class Fetcher extends Thread {
       ShuffleClientMetrics metrics,
       Shuffle shuffle, SecretKey jobTokenSecret,
       boolean ifileReadAhead, int ifileReadAheadLength, CompressionCodec codec,
-      TezInputContext inputContext) throws IOException {
+      InputContext inputContext) throws IOException {
     setDaemon(true);
     this.scheduler = scheduler;
     this.merger = merger;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/MergeManager.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/MergeManager.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/MergeManager.java
index 17880e1..3c771c1 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/MergeManager.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/MergeManager.java
@@ -45,7 +45,7 @@ import org.apache.tez.common.TezUtils;
 import org.apache.tez.common.counters.TaskCounter;
 import org.apache.tez.common.counters.TezCounter;
 import org.apache.tez.dag.api.TezUncheckedException;
-import org.apache.tez.runtime.api.TezInputContext;
+import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
 import org.apache.tez.runtime.library.common.ConfigUtils;
 import org.apache.tez.runtime.library.common.Constants;
@@ -105,7 +105,7 @@ public class MergeManager {
 
   private final ExceptionReporter exceptionReporter;
   
-  private final TezInputContext inputContext;
+  private final InputContext inputContext;
 
   private final TezCounter spilledRecordsCounter;
 
@@ -133,7 +133,7 @@ public class MergeManager {
   public MergeManager(Configuration conf, 
                       FileSystem localFS,
                       LocalDirAllocator localDirAllocator,  
-                      TezInputContext inputContext,
+                      InputContext inputContext,
                       Combiner combiner,
                       TezCounter spilledRecordsCounter,
                       TezCounter reduceCombineInputCounter,

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java
index 78806a4..daf9df6 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/Shuffle.java
@@ -46,7 +46,7 @@ import org.apache.tez.common.counters.TaskCounter;
 import org.apache.tez.common.counters.TezCounter;
 import org.apache.tez.dag.api.TezConfiguration;
 import org.apache.tez.runtime.api.Event;
-import org.apache.tez.runtime.api.TezInputContext;
+import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
 import org.apache.tez.runtime.library.common.ConfigUtils;
 import org.apache.tez.runtime.library.common.TezRuntimeUtils;
@@ -78,7 +78,7 @@ public class Shuffle implements ExceptionReporter {
   private static final int PROGRESS_FREQUENCY = 2000;
   
   private final Configuration conf;
-  private final TezInputContext inputContext;
+  private final InputContext inputContext;
   
   private final ShuffleClientMetrics metrics;
 
@@ -109,7 +109,7 @@ public class Shuffle implements ExceptionReporter {
   private AtomicBoolean schedulerClosed = new AtomicBoolean(false);
   private AtomicBoolean mergerClosed = new AtomicBoolean(false);
 
-  public Shuffle(TezInputContext inputContext, Configuration conf, int numInputs,
+  public Shuffle(InputContext inputContext, Configuration conf, int numInputs,
       long initialMemoryAvailable) throws IOException {
     this.inputContext = inputContext;
     this.conf = conf;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleInputEventHandler.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleInputEventHandler.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleInputEventHandler.java
index 23616e0..040a08a 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleInputEventHandler.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleInputEventHandler.java
@@ -35,7 +35,7 @@ import org.apache.tez.common.TezRuntimeFrameworkConfigs;
 import org.apache.tez.common.TezUtils;
 import org.apache.tez.dag.api.TezUncheckedException;
 import org.apache.tez.runtime.api.Event;
-import org.apache.tez.runtime.api.TezInputContext;
+import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.api.events.DataMovementEvent;
 import org.apache.tez.runtime.api.events.InputFailedEvent;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
@@ -53,7 +53,7 @@ public class ShuffleInputEventHandler {
   private static final Log LOG = LogFactory.getLog(ShuffleInputEventHandler.class);
 
   private final ShuffleScheduler scheduler;
-  private final TezInputContext inputContext;
+  private final InputContext inputContext;
 
   private int maxMapRuntime = 0;
   private final MergeManager merger;
@@ -61,7 +61,7 @@ public class ShuffleInputEventHandler {
   private final boolean sslShuffle;
   private final boolean doLocalFetch;
 
-  public ShuffleInputEventHandler(TezInputContext inputContext,
+  public ShuffleInputEventHandler(InputContext inputContext,
       ShuffleScheduler scheduler, MergeManager merger, Configuration conf, boolean sslShuffle) {
     this.inputContext = inputContext;
     this.scheduler = scheduler;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleScheduler.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleScheduler.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleScheduler.java
index db322f7..13acf7b 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleScheduler.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleScheduler.java
@@ -42,7 +42,7 @@ import org.apache.tez.common.TezUtils;
 import org.apache.tez.common.counters.TaskCounter;
 import org.apache.tez.common.counters.TezCounter;
 import org.apache.tez.runtime.api.Event;
-import org.apache.tez.runtime.api.TezInputContext;
+import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.api.events.InputReadErrorEvent;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
 import org.apache.tez.runtime.library.common.InputAttemptIdentifier;
@@ -79,7 +79,7 @@ class ShuffleScheduler {
     new HashMap<InputAttemptIdentifier,IntWritable>(); 
   private final Map<String,IntWritable> hostFailures = 
     new HashMap<String,IntWritable>();
-  private final TezInputContext inputContext;
+  private final InputContext inputContext;
   private final Shuffle shuffle;
   private final TezCounter shuffledInputsCounter;
   private final TezCounter skippedInputCounter;
@@ -102,7 +102,7 @@ class ShuffleScheduler {
   private long totalBytesShuffledTillNow = 0;
   private DecimalFormat  mbpsFormat = new DecimalFormat("0.00");
   
-  public ShuffleScheduler(TezInputContext inputContext,
+  public ShuffleScheduler(InputContext inputContext,
                           Configuration conf,
                           int numberOfInputs,
                           Shuffle shuffle,

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java
index 0f4dbe2..00f985e 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java
@@ -44,7 +44,7 @@ import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.tez.common.TezRuntimeFrameworkConfigs;
 import org.apache.tez.common.counters.TaskCounter;
 import org.apache.tez.common.counters.TezCounter;
-import org.apache.tez.runtime.api.TezOutputContext;
+import org.apache.tez.runtime.api.OutputContext;
 import org.apache.tez.runtime.library.api.Partitioner;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
 import org.apache.tez.runtime.library.common.ConfigUtils;
@@ -77,7 +77,7 @@ public abstract class ExternalSorter {
   }
 
   protected final Progressable nullProgressable = new NullProgressable();
-  protected final TezOutputContext outputContext;
+  protected final OutputContext outputContext;
   protected final Combiner combiner;
   protected final Partitioner partitioner;
   protected final Configuration conf;
@@ -129,7 +129,7 @@ public abstract class ExternalSorter {
   // spills)
   protected final TezCounter numAdditionalSpills;
 
-  public ExternalSorter(TezOutputContext outputContext, Configuration conf, int numOutputs,
+  public ExternalSorter(OutputContext outputContext, Configuration conf, int numOutputs,
       long initialMemoryAvailable) throws IOException {
     this.outputContext = outputContext;
     this.conf = conf;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/PipelinedSorter.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/PipelinedSorter.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/PipelinedSorter.java
index 6960736..7c28f95 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/PipelinedSorter.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/PipelinedSorter.java
@@ -44,7 +44,7 @@ import org.apache.hadoop.util.IndexedSortable;
 import org.apache.hadoop.util.IndexedSorter;
 import org.apache.hadoop.util.Progress;
 import org.apache.tez.common.TezUtils;
-import org.apache.tez.runtime.api.TezOutputContext;
+import org.apache.tez.runtime.api.OutputContext;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
 import org.apache.tez.runtime.library.common.ConfigUtils;
 import org.apache.tez.runtime.library.common.sort.impl.IFile.Writer;
@@ -93,7 +93,7 @@ public class PipelinedSorter extends ExternalSorter {
 
   // TODO Set additional countesr - total bytes written, spills etc.
 
-  public PipelinedSorter(TezOutputContext outputContext, Configuration conf, int numOutputs,
+  public PipelinedSorter(OutputContext outputContext, Configuration conf, int numOutputs,
       long initialMemoryAvailable) throws IOException {
     super(outputContext, conf, numOutputs, initialMemoryAvailable);
     

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/dflt/DefaultSorter.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/dflt/DefaultSorter.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/dflt/DefaultSorter.java
index da6351d..7f28240 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/dflt/DefaultSorter.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/dflt/DefaultSorter.java
@@ -40,7 +40,7 @@ import org.apache.hadoop.util.IndexedSortable;
 import org.apache.hadoop.util.Progress;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.tez.common.TezUtils;
-import org.apache.tez.runtime.api.TezOutputContext;
+import org.apache.tez.runtime.api.OutputContext;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
 import org.apache.tez.runtime.library.common.ConfigUtils;
 import org.apache.tez.runtime.library.common.sort.impl.ExternalSorter;
@@ -111,7 +111,7 @@ public class DefaultSorter extends ExternalSorter implements IndexedSortable {
   private final int indexCacheMemoryLimit;
   private int totalIndexCacheMemory;
 
-  public DefaultSorter(TezOutputContext outputContext, Configuration conf, int numOutputs,
+  public DefaultSorter(OutputContext outputContext, Configuration conf, int numOutputs,
       long initialMemoryAvailable) throws IOException {
     super(outputContext, conf, numOutputs, initialMemoryAvailable);
     // sanity checks

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/writers/BaseUnorderedPartitionedKVWriter.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/writers/BaseUnorderedPartitionedKVWriter.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/writers/BaseUnorderedPartitionedKVWriter.java
index f784760..d1d575d 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/writers/BaseUnorderedPartitionedKVWriter.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/writers/BaseUnorderedPartitionedKVWriter.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.tez.common.counters.TaskCounter;
 import org.apache.tez.common.counters.TezCounter;
 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.KeyValuesWriter;
 import org.apache.tez.runtime.library.api.Partitioner;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
@@ -46,7 +46,7 @@ public abstract class BaseUnorderedPartitionedKVWriter extends KeyValuesWriter {
 
   private static final Log LOG = LogFactory.getLog(BaseUnorderedPartitionedKVWriter.class);
   
-  protected final TezOutputContext outputContext;
+  protected final OutputContext outputContext;
   protected final Configuration conf;
   protected final Partitioner partitioner;
   protected final Class keyClass;
@@ -102,7 +102,7 @@ public abstract class BaseUnorderedPartitionedKVWriter extends KeyValuesWriter {
   protected final TezCounter numAdditionalSpillsCounter;
 
   @SuppressWarnings("unchecked")
-  public BaseUnorderedPartitionedKVWriter(TezOutputContext outputContext, Configuration conf, int numOutputs) {
+  public BaseUnorderedPartitionedKVWriter(OutputContext outputContext, Configuration conf, int numOutputs) {
     this.outputContext = outputContext;
     this.conf = conf;
     this.numPartitions = numOutputs;

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/writers/UnorderedPartitionedKVWriter.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/writers/UnorderedPartitionedKVWriter.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/writers/UnorderedPartitionedKVWriter.java
index 60bb021..8e98d1c 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/writers/UnorderedPartitionedKVWriter.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/writers/UnorderedPartitionedKVWriter.java
@@ -53,7 +53,7 @@ import org.apache.tez.common.TezUtils;
 import org.apache.tez.common.counters.TaskCounter;
 import org.apache.tez.common.counters.TezCounter;
 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.api.events.CompositeDataMovementEvent;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
 import org.apache.tez.runtime.library.common.Constants;
@@ -130,7 +130,7 @@ public class UnorderedPartitionedKVWriter extends BaseUnorderedPartitionedKVWrit
   private final ReentrantLock spillLock = new ReentrantLock();
   private final Condition spillInProgress = spillLock.newCondition();
 
-  public UnorderedPartitionedKVWriter(TezOutputContext outputContext, Configuration conf,
+  public UnorderedPartitionedKVWriter(OutputContext outputContext, Configuration conf,
       int numOutputs, long availableMemoryBytes) throws IOException {
     super(outputContext, conf, numOutputs);
     Preconditions.checkArgument(availableMemoryBytes > 0, "availableMemory should not be > 0 bytes");

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/OrderedPartitionedKVEdgeConfigurer.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/OrderedPartitionedKVEdgeConfigurer.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/OrderedPartitionedKVEdgeConfigurer.java
index 37e3ddc..029d640 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/OrderedPartitionedKVEdgeConfigurer.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/OrderedPartitionedKVEdgeConfigurer.java
@@ -25,7 +25,7 @@ import com.google.common.base.Preconditions;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.tez.dag.api.EdgeManagerDescriptor;
+import org.apache.tez.dag.api.EdgeManagerPluginDescriptor;
 import org.apache.tez.dag.api.EdgeProperty;
 import org.apache.tez.dag.api.InputDescriptor;
 import org.apache.tez.dag.api.OutputDescriptor;
@@ -129,7 +129,7 @@ public class OrderedPartitionedKVEdgeConfigurer extends HadoopKeyValuesBasedBase
    * @param edgeManagerDescriptor the custom edge specification
    * @return an {@link org.apache.tez.dag.api.EdgeProperty} instance
    */
-  public EdgeProperty createDefaultCustomEdgeProperty(EdgeManagerDescriptor edgeManagerDescriptor) {
+  public EdgeProperty createDefaultCustomEdgeProperty(EdgeManagerPluginDescriptor edgeManagerDescriptor) {
     Preconditions.checkNotNull(edgeManagerDescriptor, "EdgeManagerDescriptor cannot be null");
     EdgeProperty edgeProperty =
         new EdgeProperty(edgeManagerDescriptor, EdgeProperty.DataSourceType.PERSISTED,

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/UnorderedPartitionedKVEdgeConfigurer.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/UnorderedPartitionedKVEdgeConfigurer.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/UnorderedPartitionedKVEdgeConfigurer.java
index 1e2634a..728f8b3 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/UnorderedPartitionedKVEdgeConfigurer.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/UnorderedPartitionedKVEdgeConfigurer.java
@@ -27,7 +27,7 @@ import com.google.common.base.Preconditions;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.tez.dag.api.EdgeManagerDescriptor;
+import org.apache.tez.dag.api.EdgeManagerPluginDescriptor;
 import org.apache.tez.dag.api.EdgeProperty;
 import org.apache.tez.dag.api.InputDescriptor;
 import org.apache.tez.dag.api.OutputDescriptor;
@@ -135,7 +135,7 @@ public class UnorderedPartitionedKVEdgeConfigurer extends HadoopKeyValuesBasedBa
    * @param edgeManagerDescriptor the custom edge specification
    * @return an {@link org.apache.tez.dag.api.EdgeProperty} instance
    */
-  public EdgeProperty createDefaultCustomEdgeProperty(EdgeManagerDescriptor edgeManagerDescriptor) {
+  public EdgeProperty createDefaultCustomEdgeProperty(EdgeManagerPluginDescriptor edgeManagerDescriptor) {
     Preconditions.checkNotNull(edgeManagerDescriptor, "EdgeManagerDescriptor cannot be null");
     EdgeProperty edgeProperty =
         new EdgeProperty(edgeManagerDescriptor, EdgeProperty.DataSourceType.PERSISTED,

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/UnorderedUnpartitionedKVEdgeConfigurer.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/UnorderedUnpartitionedKVEdgeConfigurer.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/UnorderedUnpartitionedKVEdgeConfigurer.java
index 1f35f10..20cc449 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/UnorderedUnpartitionedKVEdgeConfigurer.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/conf/UnorderedUnpartitionedKVEdgeConfigurer.java
@@ -27,7 +27,7 @@ import com.google.common.base.Preconditions;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.tez.dag.api.EdgeManagerDescriptor;
+import org.apache.tez.dag.api.EdgeManagerPluginDescriptor;
 import org.apache.tez.dag.api.EdgeProperty;
 import org.apache.tez.dag.api.InputDescriptor;
 import org.apache.tez.dag.api.OutputDescriptor;
@@ -131,7 +131,7 @@ public class UnorderedUnpartitionedKVEdgeConfigurer extends HadoopKeyValuesBased
    * @param edgeManagerDescriptor the custom edge specification
    * @return an {@link org.apache.tez.dag.api.EdgeProperty} instance
    */
-  public EdgeProperty createDefaultCustomEdgeProperty(EdgeManagerDescriptor edgeManagerDescriptor) {
+  public EdgeProperty createDefaultCustomEdgeProperty(EdgeManagerPluginDescriptor edgeManagerDescriptor) {
     Preconditions.checkNotNull(edgeManagerDescriptor, "EdgeManagerDescriptor cannot be null");
     EdgeProperty edgeProperty =
         new EdgeProperty(edgeManagerDescriptor, EdgeProperty.DataSourceType.PERSISTED,

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ConcatenatedMergedKeyValueInput.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ConcatenatedMergedKeyValueInput.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ConcatenatedMergedKeyValueInput.java
index 0012bae..f8d4215 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ConcatenatedMergedKeyValueInput.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ConcatenatedMergedKeyValueInput.java
@@ -25,12 +25,12 @@ import org.apache.tez.dag.api.TezUncheckedException;
 import org.apache.tez.runtime.api.Input;
 import org.apache.tez.runtime.api.MergedLogicalInput;
 import org.apache.tez.runtime.api.Reader;
-import org.apache.tez.runtime.api.TezMergedInputContext;
+import org.apache.tez.runtime.api.MergedInputContext;
 import org.apache.tez.runtime.library.api.KeyValueReader;
 
 public class ConcatenatedMergedKeyValueInput extends MergedLogicalInput {
 
-  public ConcatenatedMergedKeyValueInput(TezMergedInputContext context,
+  public ConcatenatedMergedKeyValueInput(MergedInputContext context,
                                          List<Input> inputs) {
     super(context, inputs);
   }

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ConcatenatedMergedKeyValuesInput.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ConcatenatedMergedKeyValuesInput.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ConcatenatedMergedKeyValuesInput.java
index 9bcadd8..3d5fed1 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ConcatenatedMergedKeyValuesInput.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ConcatenatedMergedKeyValuesInput.java
@@ -25,12 +25,12 @@ import org.apache.tez.dag.api.TezUncheckedException;
 import org.apache.tez.runtime.api.Input;
 import org.apache.tez.runtime.api.MergedLogicalInput;
 import org.apache.tez.runtime.api.Reader;
-import org.apache.tez.runtime.api.TezMergedInputContext;
+import org.apache.tez.runtime.api.MergedInputContext;
 import org.apache.tez.runtime.library.api.KeyValuesReader;
 
 public class ConcatenatedMergedKeyValuesInput extends MergedLogicalInput {
 
-  public ConcatenatedMergedKeyValuesInput(TezMergedInputContext context,
+  public ConcatenatedMergedKeyValuesInput(MergedInputContext context,
                                           List<Input> inputs) {
     super(context, inputs);
   }

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/LocalMergedInput.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/LocalMergedInput.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/LocalMergedInput.java
index e1f825e..65938a8 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/LocalMergedInput.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/LocalMergedInput.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.tez.common.TezUtils;
 import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.LogicalInput;
-import org.apache.tez.runtime.api.TezInputContext;
+import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.library.common.localshuffle.LocalShuffle;
 
 /**
@@ -33,7 +33,7 @@ import org.apache.tez.runtime.library.common.localshuffle.LocalShuffle;
  */
 public class LocalMergedInput extends ShuffledMergedInputLegacy {
 
-  public LocalMergedInput(TezInputContext inputContext, int numPhysicalInputs) {
+  public LocalMergedInput(InputContext inputContext, int numPhysicalInputs) {
     super(inputContext, numPhysicalInputs);
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInput.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInput.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInput.java
index 4c457bf..f09936b 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInput.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInput.java
@@ -39,7 +39,7 @@ import org.apache.tez.common.counters.TezCounter;
 import org.apache.tez.dag.api.TezConfiguration;
 import org.apache.tez.runtime.api.AbstractLogicalInput;
 import org.apache.tez.runtime.api.Event;
-import org.apache.tez.runtime.api.TezInputContext;
+import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.library.api.KeyValuesReader;
 import org.apache.tez.runtime.library.api.TezRuntimeConfiguration;
 import org.apache.tez.runtime.library.common.ConfigUtils;
@@ -80,7 +80,7 @@ public class ShuffledMergedInput extends AbstractLogicalInput {
 
   private final AtomicBoolean isStarted = new AtomicBoolean(false);
 
-  public ShuffledMergedInput(TezInputContext inputContext, int numPhysicalInputs) {
+  public ShuffledMergedInput(InputContext inputContext, int numPhysicalInputs) {
     super(inputContext, numPhysicalInputs);
   }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/27e5b6c6/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInputLegacy.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInputLegacy.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInputLegacy.java
index 612bab5..2e3d354 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInputLegacy.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/input/ShuffledMergedInputLegacy.java
@@ -24,7 +24,7 @@ import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.io.DataInputBuffer;
 import org.apache.hadoop.util.Progress;
-import org.apache.tez.runtime.api.TezInputContext;
+import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.library.common.sort.impl.TezRawKeyValueIterator;
 
 @LimitedPrivate("mapreduce")
@@ -32,7 +32,7 @@ public class ShuffledMergedInputLegacy extends ShuffledMergedInput {
 
   private final Progress progress = new Progress();
 
-  public ShuffledMergedInputLegacy(TezInputContext inputContext, int numPhysicalInputs) {
+  public ShuffledMergedInputLegacy(InputContext inputContext, int numPhysicalInputs) {
     super(inputContext, numPhysicalInputs);
   }
 


Mime
View raw message