You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2013/06/04 07:33:09 UTC
[07/50] [abbrv] TEZ-123. Cleanup package dependencies. (bikas)
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/BipartiteSlowStartVertexScheduler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/BipartiteSlowStartVertexScheduler.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/BipartiteSlowStartVertexScheduler.java
index f9e8eb7..6c7bb0f 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/BipartiteSlowStartVertexScheduler.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/BipartiteSlowStartVertexScheduler.java
@@ -29,9 +29,9 @@ import org.apache.tez.dag.api.TezException;
import org.apache.tez.dag.api.EdgeProperty.ConnectionPattern;
import org.apache.tez.dag.app.dag.Vertex;
import org.apache.tez.dag.app.dag.VertexScheduler;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
-import org.apache.tez.engine.records.TezVertexID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskID;
+import org.apache.tez.dag.records.TezVertexID;
/**
* Starts scheduling tasks when number of completed source tasks crosses
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
index cc3170e..02e91b4 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
@@ -58,8 +58,8 @@ import org.apache.tez.dag.api.DAGProtos.VertexPlan;
import org.apache.tez.dag.api.EdgeProperty;
import org.apache.tez.dag.api.TezConfiguration;
import org.apache.tez.dag.api.VertexLocationHint;
-import org.apache.tez.dag.api.client.DAGStatus;
import org.apache.tez.dag.api.client.impl.TezBuilderUtils;
+import org.apache.tez.dag.api.impl.DAGStatus;
import org.apache.tez.dag.api.DagTypeConverters;
import org.apache.tez.dag.app.AppContext;
import org.apache.tez.dag.app.TaskAttemptListener;
@@ -81,12 +81,12 @@ import org.apache.tez.dag.app.dag.event.VertexEventType;
import org.apache.tez.dag.history.DAGHistoryEvent;
import org.apache.tez.dag.history.events.DAGFinishedEvent;
import org.apache.tez.dag.history.events.DAGStartedEvent;
+import org.apache.tez.dag.records.TezDAGID;
+import org.apache.tez.dag.records.TezVertexID;
import org.apache.tez.dag.utils.DAGApps;
import org.apache.tez.engine.common.security.JobTokenIdentifier;
import org.apache.tez.engine.common.security.JobTokenSecretManager;
import org.apache.tez.engine.common.security.TokenCache;
-import org.apache.tez.engine.records.TezDAGID;
-import org.apache.tez.engine.records.TezVertexID;
import org.apache.tez.mapreduce.hadoop.MRJobConfig;
/** Implementation of Job interface. Maintains the state machines of Job.
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/ImmediateStartVertexScheduler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/ImmediateStartVertexScheduler.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/ImmediateStartVertexScheduler.java
index 1d13aa4..bd39115 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/ImmediateStartVertexScheduler.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/ImmediateStartVertexScheduler.java
@@ -20,7 +20,7 @@ package org.apache.tez.dag.app.dag.impl;
import org.apache.tez.dag.app.dag.Vertex;
import org.apache.tez.dag.app.dag.VertexScheduler;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
/**
* Starts all tasks immediately on vertex start
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
index c907e48..2564ffa 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
@@ -91,9 +91,9 @@ import org.apache.tez.dag.app.rm.AMSchedulerEventTALaunchRequest;
import org.apache.tez.dag.history.DAGHistoryEvent;
import org.apache.tez.dag.history.events.TaskAttemptFinishedEvent;
import org.apache.tez.dag.history.events.TaskAttemptStartedEvent;
+import org.apache.tez.dag.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskID;
import org.apache.tez.engine.common.security.JobTokenIdentifier;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
import com.google.common.annotations.VisibleForTesting;
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
index cf49dbd..4d0c4f6 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
@@ -67,11 +67,11 @@ import org.apache.tez.dag.app.dag.event.VertexEventTaskReschedule;
import org.apache.tez.dag.history.DAGHistoryEvent;
import org.apache.tez.dag.history.events.TaskFinishedEvent;
import org.apache.tez.dag.history.events.TaskStartedEvent;
+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.engine.common.security.JobTokenIdentifier;
import org.apache.tez.engine.records.TezDependentTaskCompletionEvent;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
-import org.apache.tez.engine.records.TezVertexID;
import com.google.common.annotations.VisibleForTesting;
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
index b9e911c..3f3ac49 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
@@ -62,11 +62,11 @@ import org.apache.tez.dag.api.EdgeProperty.ConnectionPattern;
import org.apache.tez.dag.api.EdgeProperty;
import org.apache.tez.dag.api.VertexLocationHint;
import org.apache.tez.dag.api.VertexLocationHint.TaskLocationHint;
-import org.apache.tez.dag.api.client.VertexStatus;
-import org.apache.tez.dag.api.client.VertexStatus.State;
import org.apache.tez.dag.api.impl.NullVertexOutputCommitter;
import org.apache.tez.dag.api.impl.VertexContext;
import org.apache.tez.dag.api.impl.VertexOutputCommitter;
+import org.apache.tez.dag.api.impl.VertexStatus;
+import org.apache.tez.dag.api.impl.VertexStatus.State;
import org.apache.tez.dag.api.records.TaskState;
import org.apache.tez.dag.app.AppContext;
import org.apache.tez.dag.app.TaskAttemptListener;
@@ -94,12 +94,12 @@ import org.apache.tez.dag.app.dag.event.VertexEventType;
import org.apache.tez.dag.history.DAGHistoryEvent;
import org.apache.tez.dag.history.events.VertexFinishedEvent;
import org.apache.tez.dag.history.events.VertexStartedEvent;
+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.engine.common.security.JobTokenIdentifier;
-import org.apache.tez.engine.records.TezDAGID;
import org.apache.tez.engine.records.TezDependentTaskCompletionEvent;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
-import org.apache.tez.engine.records.TezVertexID;
/** Implementation of Vertex interface. Maintains the state machines of Vertex.
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTAEnded.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTAEnded.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTAEnded.java
index 3a32662..fddd204 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTAEnded.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTAEnded.java
@@ -20,7 +20,7 @@ package org.apache.tez.dag.app.rm;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.tez.dag.api.records.TaskAttemptState;
import org.apache.tez.dag.app.dag.TaskAttempt;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
public class AMSchedulerEventTAEnded extends AMSchedulerEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTALaunchRequest.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTALaunchRequest.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTALaunchRequest.java
index 04fd740..b595c2b 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTALaunchRequest.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/AMSchedulerEventTALaunchRequest.java
@@ -27,8 +27,8 @@ import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.tez.common.TezTaskContext;
import org.apache.tez.dag.api.TezConfiguration;
import org.apache.tez.dag.app.dag.TaskAttempt;
+import org.apache.tez.dag.records.TezTaskAttemptID;
import org.apache.tez.engine.common.security.JobTokenIdentifier;
-import org.apache.tez.engine.records.TezTaskAttemptID;
public class AMSchedulerEventTALaunchRequest extends AMSchedulerEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainer.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainer.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainer.java
index 3637ded..3c00620 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainer.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainer.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.hadoop.yarn.api.records.Container;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.event.EventHandler;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
public interface AMContainer extends EventHandler<AMContainerEvent>{
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventAssignTA.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventAssignTA.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventAssignTA.java
index 7bc0d7e..0fe5b3b 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventAssignTA.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventAssignTA.java
@@ -19,7 +19,7 @@ package org.apache.tez.dag.app.rm.container;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.tez.common.TezTaskContext;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
public class AMContainerEventAssignTA extends AMContainerEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventLaunchRequest.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventLaunchRequest.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventLaunchRequest.java
index e672052..4e199da 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventLaunchRequest.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventLaunchRequest.java
@@ -25,9 +25,9 @@ import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.LocalResource;
import org.apache.tez.dag.api.TezConfiguration;
+import org.apache.tez.dag.records.TezDAGID;
+import org.apache.tez.dag.records.TezVertexID;
import org.apache.tez.engine.common.security.JobTokenIdentifier;
-import org.apache.tez.engine.records.TezDAGID;
-import org.apache.tez.engine.records.TezVertexID;
public class AMContainerEventLaunchRequest extends AMContainerEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventTASucceeded.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventTASucceeded.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventTASucceeded.java
index 1deb9f4..e0c8fe7 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventTASucceeded.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerEventTASucceeded.java
@@ -18,7 +18,7 @@
package org.apache.tez.dag.app.rm.container;
import org.apache.hadoop.yarn.api.records.ContainerId;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
public class AMContainerEventTASucceeded extends AMContainerEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
index c02ed7a..5eca572 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
@@ -49,11 +49,11 @@ import org.apache.hadoop.yarn.util.ConverterUtils;
import org.apache.tez.dag.api.TezConfiguration;
import org.apache.tez.dag.app.AppContext;
import org.apache.tez.dag.app.TaskAttemptListener;
+import org.apache.tez.dag.records.TezVertexID;
import org.apache.tez.dag.utils.TezEngineChildJVM;
import org.apache.tez.engine.common.security.JobTokenIdentifier;
import org.apache.tez.engine.common.security.TokenCache;
import org.apache.tez.engine.common.shuffle.server.ShuffleHandler;
-import org.apache.tez.engine.records.TezVertexID;
import com.google.common.annotations.VisibleForTesting;
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerImpl.java
index 474af31..1089013 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerImpl.java
@@ -56,7 +56,7 @@ import org.apache.tez.dag.app.rm.NMCommunicatorLaunchRequestEvent;
import org.apache.tez.dag.app.rm.NMCommunicatorStopRequestEvent;
import org.apache.tez.dag.history.DAGHistoryEvent;
import org.apache.tez.dag.history.events.ContainerLaunchedEvent;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
@SuppressWarnings("rawtypes")
public class AMContainerImpl implements AMContainer {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeEventTaskAttemptEnded.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeEventTaskAttemptEnded.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeEventTaskAttemptEnded.java
index 9173713..cc2b7f7 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeEventTaskAttemptEnded.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeEventTaskAttemptEnded.java
@@ -19,7 +19,7 @@ package org.apache.tez.dag.app.rm.node;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.NodeId;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
public class AMNodeEventTaskAttemptEnded extends AMNodeEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeEventTaskAttemptSucceeded.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeEventTaskAttemptSucceeded.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeEventTaskAttemptSucceeded.java
index 6599efa..b07d594 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeEventTaskAttemptSucceeded.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeEventTaskAttemptSucceeded.java
@@ -19,7 +19,7 @@ package org.apache.tez.dag.app.rm.node;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.NodeId;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
public class AMNodeEventTaskAttemptSucceeded extends AMNodeEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/DefaultSpeculator.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/DefaultSpeculator.java b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/DefaultSpeculator.java
index ccd148c..04c104a 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/DefaultSpeculator.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/DefaultSpeculator.java
@@ -47,9 +47,9 @@ import org.apache.tez.dag.app.dag.TaskAttempt;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventStatusUpdate.TaskAttemptStatus;
import org.apache.tez.dag.app.dag.event.TaskEvent;
import org.apache.tez.dag.app.dag.event.TaskEventType;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
-import org.apache.tez.engine.records.TezVertexID;
+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.mapreduce.hadoop.MRJobConfig;
// FIXME does not handle multiple vertices
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/ExponentiallySmoothedTaskRuntimeEstimator.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/ExponentiallySmoothedTaskRuntimeEstimator.java b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/ExponentiallySmoothedTaskRuntimeEstimator.java
index 83196b0..558f78c 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/ExponentiallySmoothedTaskRuntimeEstimator.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/ExponentiallySmoothedTaskRuntimeEstimator.java
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.hadoop.conf.Configuration;
import org.apache.tez.dag.app.AppContext;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventStatusUpdate.TaskAttemptStatus;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
import org.apache.tez.mapreduce.hadoop.MRJobConfig;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/LegacyTaskRuntimeEstimator.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/LegacyTaskRuntimeEstimator.java b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/LegacyTaskRuntimeEstimator.java
index 4ef9991..aa95f37 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/LegacyTaskRuntimeEstimator.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/LegacyTaskRuntimeEstimator.java
@@ -28,8 +28,8 @@ import org.apache.tez.dag.app.dag.DAG;
import org.apache.tez.dag.app.dag.Task;
import org.apache.tez.dag.app.dag.TaskAttempt;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventStatusUpdate.TaskAttemptStatus;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskID;
public class LegacyTaskRuntimeEstimator extends StartEndTimesBase {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/NullTaskRuntimesEngine.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/NullTaskRuntimesEngine.java b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/NullTaskRuntimesEngine.java
index e49c9fb..9907bc6 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/NullTaskRuntimesEngine.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/NullTaskRuntimesEngine.java
@@ -21,8 +21,8 @@ package org.apache.tez.dag.app.speculate;
import org.apache.hadoop.conf.Configuration;
import org.apache.tez.dag.app.AppContext;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventStatusUpdate.TaskAttemptStatus;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskID;
/*
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/SpeculatorEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/SpeculatorEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/SpeculatorEvent.java
index 08697ee..c8f400b 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/SpeculatorEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/SpeculatorEvent.java
@@ -20,9 +20,9 @@ package org.apache.tez.dag.app.speculate;
import org.apache.hadoop.yarn.event.AbstractEvent;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventStatusUpdate.TaskAttemptStatus;
-import org.apache.tez.engine.records.TezDAGID;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
+import org.apache.tez.dag.records.TezDAGID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskID;
public class SpeculatorEvent extends AbstractEvent<Speculator.EventType> {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/StartEndTimesBase.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/StartEndTimesBase.java b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/StartEndTimesBase.java
index 317d9c1..191d0b9 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/StartEndTimesBase.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/StartEndTimesBase.java
@@ -33,9 +33,9 @@ import org.apache.tez.dag.app.dag.Task;
import org.apache.tez.dag.app.dag.TaskAttempt;
import org.apache.tez.dag.app.dag.Vertex;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventStatusUpdate.TaskAttemptStatus;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
-import org.apache.tez.engine.records.TezVertexID;
+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.mapreduce.hadoop.MRJobConfig;
abstract class StartEndTimesBase<V> implements TaskRuntimeEstimator {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/TaskRuntimeEstimator.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/TaskRuntimeEstimator.java b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/TaskRuntimeEstimator.java
index 81aa9c9..965d965 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/TaskRuntimeEstimator.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/TaskRuntimeEstimator.java
@@ -21,8 +21,8 @@ package org.apache.tez.dag.app.speculate;
import org.apache.hadoop.conf.Configuration;
import org.apache.tez.dag.app.AppContext;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventStatusUpdate.TaskAttemptStatus;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskID;
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/TaskSpeculationPredicate.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/TaskSpeculationPredicate.java b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/TaskSpeculationPredicate.java
index 6516bac..33ea09f 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/TaskSpeculationPredicate.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/speculate/TaskSpeculationPredicate.java
@@ -21,7 +21,7 @@ package org.apache.tez.dag.app.speculate;
import org.apache.tez.dag.app.AppContext;
import org.apache.tez.dag.app.dag.DAG;
import org.apache.tez.dag.app.dag.Task;
-import org.apache.tez.engine.records.TezTaskID;
+import org.apache.tez.dag.records.TezTaskID;
public class TaskSpeculationPredicate {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/app/taskclean/TaskCleanupEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/taskclean/TaskCleanupEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/app/taskclean/TaskCleanupEvent.java
index 1839f53..9b6cc15 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/taskclean/TaskCleanupEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/taskclean/TaskCleanupEvent.java
@@ -21,7 +21,7 @@ package org.apache.tez.dag.app.taskclean;
import org.apache.hadoop.mapreduce.OutputCommitter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.yarn.event.AbstractEvent;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
/**
* This class encapsulates task cleanup event.
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/history/DAGHistoryEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/DAGHistoryEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/DAGHistoryEvent.java
index ba9d258..d3b8a91 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/DAGHistoryEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/DAGHistoryEvent.java
@@ -20,7 +20,7 @@ package org.apache.tez.dag.history;
import org.apache.hadoop.yarn.event.AbstractEvent;
import org.apache.tez.dag.history.avro.HistoryEventType;
-import org.apache.tez.engine.records.TezDAGID;
+import org.apache.tez.dag.records.TezDAGID;
public class DAGHistoryEvent extends AbstractEvent<HistoryEventType>{
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java
index 547a09a..d1b87b1 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGFinishedEvent.java
@@ -18,11 +18,11 @@
package org.apache.tez.dag.history.events;
-import org.apache.tez.dag.api.client.DAGStatus;
+import org.apache.tez.dag.api.impl.DAGStatus;
import org.apache.tez.dag.history.HistoryEvent;
import org.apache.tez.dag.history.avro.DAGFinished;
import org.apache.tez.dag.history.avro.HistoryEventType;
-import org.apache.tez.engine.records.TezDAGID;
+import org.apache.tez.dag.records.TezDAGID;
public class DAGFinishedEvent implements HistoryEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGStartedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGStartedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGStartedEvent.java
index 104e949..719538c 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGStartedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/DAGStartedEvent.java
@@ -21,7 +21,7 @@ package org.apache.tez.dag.history.events;
import org.apache.tez.dag.history.HistoryEvent;
import org.apache.tez.dag.history.avro.DAGStarted;
import org.apache.tez.dag.history.avro.HistoryEventType;
-import org.apache.tez.engine.records.TezDAGID;
+import org.apache.tez.dag.records.TezDAGID;
public class DAGStartedEvent implements HistoryEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java
index 7b5f3a1..4a2917e 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptFinishedEvent.java
@@ -22,7 +22,7 @@ import org.apache.tez.dag.api.records.TaskAttemptState;
import org.apache.tez.dag.history.HistoryEvent;
import org.apache.tez.dag.history.avro.HistoryEventType;
import org.apache.tez.dag.history.avro.TaskAttemptFinished;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
public class TaskAttemptFinishedEvent implements HistoryEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptStartedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptStartedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptStartedEvent.java
index ea3e71f..97c9f2f 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptStartedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskAttemptStartedEvent.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.yarn.api.records.NodeId;
import org.apache.tez.dag.history.HistoryEvent;
import org.apache.tez.dag.history.avro.HistoryEventType;
import org.apache.tez.dag.history.avro.TaskAttemptStarted;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
public class TaskAttemptStartedEvent implements HistoryEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java
index 270e50a..165dc20 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskFinishedEvent.java
@@ -22,7 +22,7 @@ import org.apache.tez.dag.api.records.TaskState;
import org.apache.tez.dag.history.HistoryEvent;
import org.apache.tez.dag.history.avro.HistoryEventType;
import org.apache.tez.dag.history.avro.TaskFinished;
-import org.apache.tez.engine.records.TezTaskID;
+import org.apache.tez.dag.records.TezTaskID;
public class TaskFinishedEvent implements HistoryEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskStartedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskStartedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskStartedEvent.java
index 6ed7868..964cc79 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskStartedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/TaskStartedEvent.java
@@ -21,7 +21,7 @@ package org.apache.tez.dag.history.events;
import org.apache.tez.dag.history.HistoryEvent;
import org.apache.tez.dag.history.avro.HistoryEventType;
import org.apache.tez.dag.history.avro.TaskStarted;
-import org.apache.tez.engine.records.TezTaskID;
+import org.apache.tez.dag.records.TezTaskID;
public class TaskStartedEvent implements HistoryEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java
index b6d4d0b..b02be1e 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexFinishedEvent.java
@@ -18,11 +18,11 @@
package org.apache.tez.dag.history.events;
-import org.apache.tez.dag.api.client.VertexStatus;
+import org.apache.tez.dag.api.impl.VertexStatus;
import org.apache.tez.dag.history.HistoryEvent;
import org.apache.tez.dag.history.avro.HistoryEventType;
import org.apache.tez.dag.history.avro.VertexFinished;
-import org.apache.tez.engine.records.TezVertexID;
+import org.apache.tez.dag.records.TezVertexID;
public class VertexFinishedEvent implements HistoryEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexStartedEvent.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexStartedEvent.java b/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexStartedEvent.java
index 98367dd..a4fa20e 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexStartedEvent.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/history/events/VertexStartedEvent.java
@@ -21,7 +21,7 @@ package org.apache.tez.dag.history.events;
import org.apache.tez.dag.history.HistoryEvent;
import org.apache.tez.dag.history.avro.HistoryEventType;
import org.apache.tez.dag.history.avro.VertexStarted;
-import org.apache.tez.engine.records.TezVertexID;
+import org.apache.tez.dag.records.TezVertexID;
public class VertexStartedEvent implements HistoryEvent {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/main/java/org/apache/tez/dag/utils/TezEngineChildJVM.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/utils/TezEngineChildJVM.java b/tez-dag/src/main/java/org/apache/tez/dag/utils/TezEngineChildJVM.java
index fee0846..727ded5 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/utils/TezEngineChildJVM.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/utils/TezEngineChildJVM.java
@@ -30,7 +30,8 @@ import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.tez.dag.api.TezConfiguration;
-import org.apache.tez.engine.records.TezVertexID;
+import org.apache.tez.dag.app.rm.container.AMContainerHelpers;
+import org.apache.tez.dag.records.TezVertexID;
public class TezEngineChildJVM {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java
index 12ddcf0..a18bd3b 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java
@@ -66,11 +66,11 @@ import org.apache.tez.dag.app.dag.event.TaskAttemptEventSchedule;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventStartedRemotely;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventType;
import org.apache.tez.dag.app.rm.container.AMContainerMap;
+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.engine.common.security.JobTokenIdentifier;
-import org.apache.tez.engine.records.TezDAGID;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
-import org.apache.tez.engine.records.TezVertexID;
import org.junit.Test;
@SuppressWarnings({ "unchecked", "rawtypes" })
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
index 13a19b9..516ea5e 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
@@ -52,11 +52,11 @@ import org.apache.tez.dag.app.dag.TaskStateInternal;
import org.apache.tez.dag.app.dag.event.TaskEvent;
import org.apache.tez.dag.app.dag.event.TaskEventTAUpdate;
import org.apache.tez.dag.app.dag.event.TaskEventType;
+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.engine.common.security.JobTokenIdentifier;
-import org.apache.tez.engine.records.TezDAGID;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
-import org.apache.tez.engine.records.TezVertexID;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine-api/pom.xml
----------------------------------------------------------------------
diff --git a/tez-engine-api/pom.xml b/tez-engine-api/pom.xml
index 7a747d2..2cc7276 100644
--- a/tez-engine-api/pom.xml
+++ b/tez-engine-api/pom.xml
@@ -25,6 +25,10 @@
<artifactId>tez-engine-api</artifactId>
<dependencies>
<dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-common</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine-api/src/main/java/org/apache/tez/engine/api/Master.java
----------------------------------------------------------------------
diff --git a/tez-engine-api/src/main/java/org/apache/tez/engine/api/Master.java b/tez-engine-api/src/main/java/org/apache/tez/engine/api/Master.java
index 3358a03..f3add9a 100644
--- a/tez-engine-api/src/main/java/org/apache/tez/engine/api/Master.java
+++ b/tez-engine-api/src/main/java/org/apache/tez/engine/api/Master.java
@@ -19,7 +19,7 @@ package org.apache.tez.engine.api;
import org.apache.hadoop.ipc.ProtocolInfo;
import org.apache.hadoop.ipc.VersionedProtocol;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
import org.apache.tez.engine.records.TezTaskDependencyCompletionEventsUpdate;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezDAGID.java
----------------------------------------------------------------------
diff --git a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezDAGID.java b/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezDAGID.java
deleted file mode 100644
index 1066409..0000000
--- a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezDAGID.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tez.engine.records;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.text.NumberFormat;
-
-import org.apache.hadoop.yarn.api.records.ApplicationId;
-import org.apache.hadoop.yarn.util.BuilderUtils;
-
-
-/**
- * TezDAGID represents the immutable and unique identifier for
- * a Tez DAG.
- *
- * TezDAGID consists of 2 parts. The first part is the {@link ApplicationId},
- * that is the YARN Application ID that this DAG belongs to. The second part is
- * the DAG number.
- *
- * @see ApplicationId
- */
-public class TezDAGID extends TezID {
-
- public static final String DAG = "dag";
- protected static final NumberFormat idFormat = NumberFormat.getInstance();
- static {
- idFormat.setGroupingUsed(false);
- idFormat.setMinimumIntegerDigits(6);
- }
-
- private ApplicationId applicationId;
-
- public TezDAGID() {
- }
-
- /**
- * Constructs a DAGID object from given {@link ApplicationId}.
- * @param applicationId Application that this dag belongs to
- * @param id the dag number
- */
- public TezDAGID(ApplicationId applicationId, int id) {
- super(id);
- if(applicationId == null) {
- throw new IllegalArgumentException("applicationId cannot be null");
- }
- this.applicationId = applicationId;
- }
-
- /**
- * Constructs a DAGID object from given parts.
- * @param yarnRMIdentifier YARN RM identifier
- * @param applicationId application number
- * @param id the dag number
- */
- public TezDAGID(String yarnRMIdentifier, int appId, int id) {
- this(BuilderUtils.newApplicationId(Long.valueOf(yarnRMIdentifier),
- appId), id);
- }
-
- /** Returns the {@link ApplicationId} object that this dag belongs to */
- public ApplicationId getApplicationId() {
- return applicationId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (!super.equals(o))
- return false;
-
- TezDAGID that = (TezDAGID)o;
- return this.applicationId.equals(that.applicationId);
- }
-
- /**Compare TaskInProgressIds by first jobIds, then by tip numbers and type.*/
- @Override
- public int compareTo(TezID o) {
- TezDAGID that = (TezDAGID)o;
- return this.applicationId.compareTo(that.applicationId);
- }
-
- @Override
- public String toString() {
- return appendTo(new StringBuilder(DAG)).toString();
- }
-
- @Override
- public void readFields(DataInput in) throws IOException {
- applicationId = BuilderUtils.newApplicationId(in.readLong(), in.readInt());
- super.readFields(in);
- }
-
- @Override
- public void write(DataOutput out) throws IOException {
- out.writeLong(applicationId.getClusterTimestamp());
- out.writeInt(applicationId.getId());
- super.write(out);
- }
-
- /**
- * Add the unique string to the given builder.
- * @param builder the builder to append to
- * @return the builder that was passed in
- */
- protected StringBuilder appendTo(StringBuilder builder) {
- return builder.append(SEPARATOR).
- append(applicationId.getClusterTimestamp()).
- append(SEPARATOR).
- append(applicationId.getId()).
- append(SEPARATOR).
- append(idFormat.format(id));
- }
-
- @Override
- public int hashCode() {
- return applicationId.hashCode() * 524287 + id;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezDependentTaskCompletionEvent.java
----------------------------------------------------------------------
diff --git a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezDependentTaskCompletionEvent.java b/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezDependentTaskCompletionEvent.java
index 91ce53c..cba752e 100644
--- a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezDependentTaskCompletionEvent.java
+++ b/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezDependentTaskCompletionEvent.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableUtils;
+import org.apache.tez.dag.records.TezTaskAttemptID;
/**
* This is used to track task completion events on
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezID.java
----------------------------------------------------------------------
diff --git a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezID.java b/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezID.java
deleted file mode 100644
index 13ea05a..0000000
--- a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezID.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tez.engine.records;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.io.WritableComparable;
-
-/**
- * A general identifier, which internally stores the id
- * as an integer. This is the super class of {@link TezJobID},
- * {@link TezTaskID} and {@link TezTaskAttemptID}.
- *
- * @see TezTaskID
- * @see TezTaskAttemptID
- */
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public abstract class TezID implements WritableComparable<TezID> {
- public static final char SEPARATOR = '_';
- protected int id;
-
- /** constructs an ID object from the given int */
- public TezID(int id) {
- this.id = id;
- }
-
- protected TezID() {
- }
-
- /** returns the int which represents the identifier */
- public int getId() {
- return id;
- }
-
- @Override
- public String toString() {
- return String.valueOf(id);
- }
-
- @Override
- public int hashCode() {
- return id;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if(o == null)
- return false;
- if (o.getClass() == this.getClass()) {
- TezID that = (TezID) o;
- return this.id == that.id;
- }
- else
- return false;
- }
-
- /** Compare IDs by associated numbers */
- public int compareTo(TezID that) {
- return this.id - that.id;
- }
-
- @Override
- public void readFields(DataInput in) throws IOException {
- this.id = in.readInt();
- }
-
- @Override
- public void write(DataOutput out) throws IOException {
- out.writeInt(id);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezTaskAttemptID.java
----------------------------------------------------------------------
diff --git a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezTaskAttemptID.java b/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezTaskAttemptID.java
deleted file mode 100644
index e59c5bf..0000000
--- a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezTaskAttemptID.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tez.engine.records;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-
-/**
- * TezTaskAttemptID represents the immutable and unique identifier for
- * a task attempt. Each task attempt is one particular instance of a Tez Task
- * identified by its TezTaskID.
- *
- * TezTaskAttemptID consists of 2 parts. First part is the
- * {@link TezTaskID}, that this TaskAttemptID belongs to.
- * Second part is the task attempt number. <br>
- * <p>
- * Applications should never construct or parse TaskAttemptID strings
- * , but rather use appropriate constructors or {@link #forName(String)}
- * method.
- *
- * @see TezTaskID
- */
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class TezTaskAttemptID extends TezID {
- public static final String ATTEMPT = "attempt";
- private TezTaskID taskId;
-
- public TezTaskAttemptID() {
- taskId = new TezTaskID();
- }
-
- /**
- * Constructs a TaskAttemptID object from given {@link TezTaskID}.
- * @param taskId TaskID that this task belongs to
- * @param id the task attempt number
- */
- public TezTaskAttemptID(TezTaskID taskId, int id) {
- super(id);
- if(taskId == null) {
- throw new IllegalArgumentException("taskId cannot be null");
- }
- this.taskId = taskId;
- }
-
- /** Returns the {@link TezTaskID} object that this task attempt belongs to */
- public TezTaskID getTaskID() {
- return taskId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (!super.equals(o))
- return false;
-
- TezTaskAttemptID that = (TezTaskAttemptID)o;
- return this.taskId.equals(that.taskId);
- }
-
- /**
- * Add the unique string to the StringBuilder
- * @param builder the builder to append ot
- * @return the builder that was passed in.
- */
- protected StringBuilder appendTo(StringBuilder builder) {
- return taskId.appendTo(builder).append(SEPARATOR).append(id);
- }
-
- @Override
- public int hashCode() {
- return taskId.hashCode() * 539501 + id;
- }
-
- /**Compare TaskIds by first tipIds, then by task numbers. */
- @Override
- public int compareTo(TezID o) {
- TezTaskAttemptID that = (TezTaskAttemptID)o;
- int tipComp = this.taskId.compareTo(that.taskId);
- if(tipComp == 0) {
- return this.id - that.id;
- }
- else return tipComp;
- }
- @Override
- public String toString() {
- return appendTo(new StringBuilder(ATTEMPT)).toString();
- }
-
- @Override
- public void readFields(DataInput in) throws IOException {
- taskId.readFields(in);
- super.readFields(in);
- }
-
- @Override
- public void write(DataOutput out) throws IOException {
- taskId.write(out);
- super.write(out);
- }
-
- // FIXME TEZ DAG needs to be removed
- public static TezTaskAttemptID read(DataInput in) throws IOException {
- TezTaskAttemptID tId = new TezTaskAttemptID();
- tId.readFields(in);
- return tId;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezTaskID.java
----------------------------------------------------------------------
diff --git a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezTaskID.java b/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezTaskID.java
deleted file mode 100644
index b6a997d..0000000
--- a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezTaskID.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tez.engine.records;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.text.NumberFormat;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-
-
-/**
- * TaskID represents the immutable and unique identifier for
- * a Tez Task. Each TaskID encompasses multiple attempts made to
- * execute the Tez Task, each of which are uniquely identified by
- * their TezTaskAttemptID.
- *
- * @see TezTaskAttemptID
- */
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class TezTaskID extends TezID {
- public static final String TASK = "task";
- protected static final NumberFormat idFormat = NumberFormat.getInstance();
- static {
- idFormat.setGroupingUsed(false);
- idFormat.setMinimumIntegerDigits(6);
- }
-
- private TezVertexID vertexId;
-
- public TezTaskID() {
- vertexId = new TezVertexID();
- }
-
- /**
- * Constructs a TaskID object from given {@link MRxApplicationID}.
- * @param jobId JobID that this tip belongs to
- * @param type the {@link TezTaskType} of the task
- * @param id the tip number
- */
- public TezTaskID(TezVertexID vertexId, int id) {
- super(id);
- if(vertexId == null) {
- throw new IllegalArgumentException("vertexId cannot be null");
- }
- this.vertexId = vertexId;
- }
-
- /** Returns the {@link TezVertexID} object that this task belongs to */
- public TezVertexID getVertexID() {
- return vertexId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (!super.equals(o))
- return false;
-
- TezTaskID that = (TezTaskID)o;
- return this.vertexId.equals(that.vertexId);
- }
-
- /**Compare TaskInProgressIds by first jobIds, then by tip numbers and type.*/
- @Override
- public int compareTo(TezID o) {
- TezTaskID that = (TezTaskID)o;
- int vertexComp = this.vertexId.compareTo(that.vertexId);
- if(vertexComp == 0) {
- return this.id - that.id;
- }
- else return vertexComp;
- }
- @Override
- public String toString() {
- return appendTo(new StringBuilder(TASK)).toString();
- }
-
- /**
- * Add the unique string to the given builder.
- * @param builder the builder to append to
- * @return the builder that was passed in
- */
- protected StringBuilder appendTo(StringBuilder builder) {
- return vertexId.appendTo(builder).
- append(SEPARATOR).
- append(idFormat.format(id));
- }
-
- @Override
- public int hashCode() {
- return vertexId.hashCode() * 535013 + id;
- }
-
- @Override
- public void readFields(DataInput in) throws IOException {
- vertexId.readFields(in);
- super.readFields(in);
- }
-
- @Override
- public void write(DataOutput out) throws IOException {
- vertexId.write(out);
- super.write(out);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezTaskType.java
----------------------------------------------------------------------
diff --git a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezTaskType.java b/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezTaskType.java
deleted file mode 100644
index 68a5541..0000000
--- a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezTaskType.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.tez.engine.records;
-///**
-// * Licensed to the Apache Software Foundation (ASF) under one or more
-// * contributor license agreements. See the NOTICE file distributed with this
-// * work for additional information regarding copyright ownership. The ASF
-// * licenses this file to you under the Apache License, Version 2.0 (the
-// * "License"); you may not use this file except in compliance with the License.
-// * You may obtain a copy of the License at
-// *
-// * http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing, software
-// * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// * License for the specific language governing permissions and limitations under
-// * the License.
-// */
-//
-//package org.apache.tez.records;
-//
-//
-//public interface TezTaskType {
-//
-// public String toSerializedString();
-//
-//}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezVertexID.java
----------------------------------------------------------------------
diff --git a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezVertexID.java b/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezVertexID.java
deleted file mode 100644
index 31acd56..0000000
--- a/tez-engine-api/src/main/java/org/apache/tez/engine/records/TezVertexID.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tez.engine.records;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.text.NumberFormat;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-
-/**
- * TezVertexID represents the immutable and unique identifier for
- * a Vertex in a Tez DAG. Each TezVertexID encompasses multiple Tez Tasks.
- *
- * TezVertezID consists of 2 parts. The first part is the {@link TezDAGID},
- * that is the Tez DAG that this vertex belongs to. The second part is
- * the vertex number.
- *
- * @see TezDAGID
- * @see TezTaskID
- */
-@InterfaceAudience.Public
-@InterfaceStability.Stable
-public class TezVertexID extends TezID {
- public static final String VERTEX = "vertex";
- protected static final NumberFormat idFormat = NumberFormat.getInstance();
- static {
- idFormat.setGroupingUsed(false);
- idFormat.setMinimumIntegerDigits(6);
- }
-
- private TezDAGID dagId;
-
- public TezVertexID() {
- }
-
- /**
- * Constructs a TaskID object from given {@link TezDAGID}.
- * @param applicationId JobID that this tip belongs to
- * @param type the {@link TezTaskType} of the task
- * @param id the tip number
- */
- public TezVertexID(TezDAGID dagId, int id) {
- super(id);
- if(dagId == null) {
- throw new IllegalArgumentException("dagId cannot be null");
- }
- this.dagId = dagId;
- }
-
- /** Returns the {@link TezDAGID} object that this tip belongs to */
- public TezDAGID getDAGId() {
- return dagId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (!super.equals(o))
- return false;
-
- TezVertexID that = (TezVertexID)o;
- return this.dagId.equals(that.dagId);
- }
-
- /**Compare TaskInProgressIds by first jobIds, then by tip numbers and type.*/
- @Override
- public int compareTo(TezID o) {
- TezVertexID that = (TezVertexID)o;
- return this.dagId.compareTo(that.dagId);
- }
-
- @Override
- public String toString() {
- return appendTo(new StringBuilder(VERTEX)).toString();
- }
-
- @Override
- public void readFields(DataInput in) throws IOException {
- dagId = new TezDAGID();
- dagId.readFields(in);
- super.readFields(in);
- }
-
- @Override
- public void write(DataOutput out) throws IOException {
- dagId.write(out);
- super.write(out);
- }
-
- /**
- * Add the unique string to the given builder.
- * @param builder the builder to append to
- * @return the builder that was passed in
- */
- protected StringBuilder appendTo(StringBuilder builder) {
- return builder.append(SEPARATOR).
- append(dagId.getApplicationId().getClusterTimestamp()).
- append(SEPARATOR).
- append(dagId.getApplicationId().getId()).
- append(SEPARATOR).
- append(dagId.getId()).
- append(SEPARATOR).
- append(idFormat.format(id));
- }
-
- @Override
- public int hashCode() {
- return dagId.hashCode() * 530017 + id;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/pom.xml
----------------------------------------------------------------------
diff --git a/tez-engine/pom.xml b/tez-engine/pom.xml
index ba5b6e6..07bda8c 100644
--- a/tez-engine/pom.xml
+++ b/tez-engine/pom.xml
@@ -34,6 +34,10 @@
<artifactId>tez-common</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-engine-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/common/TezEngineTaskContext.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/common/TezEngineTaskContext.java b/tez-engine/src/main/java/org/apache/tez/common/TezEngineTaskContext.java
index 7f825d9..350702a 100644
--- a/tez-engine/src/main/java/org/apache/tez/common/TezEngineTaskContext.java
+++ b/tez-engine/src/main/java/org/apache/tez/common/TezEngineTaskContext.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.hadoop.io.Text;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
public class TezEngineTaskContext extends TezTaskContext {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/common/TezTaskReporter.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/common/TezTaskReporter.java b/tez-engine/src/main/java/org/apache/tez/common/TezTaskReporter.java
new file mode 100644
index 0000000..1931e31
--- /dev/null
+++ b/tez-engine/src/main/java/org/apache/tez/common/TezTaskReporter.java
@@ -0,0 +1,116 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.tez.common;
+
+import java.io.IOException;
+
+import org.apache.hadoop.ipc.ProtocolSignature;
+import org.apache.hadoop.util.Progressable;
+import org.apache.tez.common.counters.TezCounter;
+import org.apache.tez.dag.records.TezTaskAttemptID;
+import org.apache.tez.engine.api.Master;
+import org.apache.tez.engine.records.TezTaskDependencyCompletionEventsUpdate;
+
+public interface TezTaskReporter extends Progressable, Master {
+
+ public void setStatus(String status);
+
+ public float getProgress();
+
+ public void setProgress(float progress);
+
+ public void progress();
+
+ public TezCounter getCounter(String group, String name);
+
+ public TezCounter getCounter(Enum<?> name);
+
+ public void incrCounter(String group, String counter, long amount);
+
+ public void incrCounter(Enum<?> key, long amount);
+
+ public void reportFatalError(TezTaskAttemptID taskAttemptId,
+ Throwable exception, String logMsg);
+
+ public final TezTaskReporter NULL = new TezTaskReporter() {
+
+ @Override
+ public TezTaskDependencyCompletionEventsUpdate getDependentTasksCompletionEvents(
+ int fromEventIdx, int maxEventsToFetch,
+ TezTaskAttemptID reduce) {
+ return null;
+ }
+
+ @Override
+ public void setStatus(String status) {
+ }
+
+ @Override
+ public void setProgress(float progress) {
+ }
+
+ @Override
+ public void progress() {
+ }
+
+ @Override
+ public void incrCounter(Enum<?> key, long amount) {
+ }
+
+ @Override
+ public void incrCounter(String group, String counter, long amount) {
+ }
+
+ @Override
+ public float getProgress() {
+ return 0.0f;
+ }
+
+ @Override
+ public TezCounter getCounter(Enum<?> name) {
+ return null;
+ }
+
+ @Override
+ public TezCounter getCounter(String group, String name) {
+ return null;
+ }
+
+ @Override
+ public void reportFatalError(TezTaskAttemptID taskAttemptId,
+ Throwable exception, String logMsg) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public long getProtocolVersion(String protocol, long clientVersion)
+ throws IOException {
+ // TODO TEZAM3
+ return 0;
+ }
+
+ @Override
+ public ProtocolSignature getProtocolSignature(String protocol,
+ long clientVersion, int clientMethodsHash) throws IOException {
+ // TODO TEZAM3
+ return null;
+ }
+ };
+}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/common/TezTaskUmbilicalProtocol.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/common/TezTaskUmbilicalProtocol.java b/tez-engine/src/main/java/org/apache/tez/common/TezTaskUmbilicalProtocol.java
new file mode 100644
index 0000000..e94fd30
--- /dev/null
+++ b/tez-engine/src/main/java/org/apache/tez/common/TezTaskUmbilicalProtocol.java
@@ -0,0 +1,79 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tez.common;
+
+import java.io.IOException;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.tez.common.records.ProceedToCompletionResponse;
+import org.apache.tez.dag.records.TezTaskAttemptID;
+import org.apache.tez.engine.api.Master;
+import org.apache.tez.engine.records.OutputContext;
+
+/** Protocol that task child process uses to contact its parent process. The
+ * parent is a daemon which which polls the central master for a new map or
+ * reduce task and runs it as a child process. All communication between child
+ * and parent is via this protocol. */
+@InterfaceAudience.Private
+@InterfaceStability.Stable
+public interface TezTaskUmbilicalProtocol extends Master {
+
+ public static final long versionID = 19L;
+
+ ContainerTask getTask(ContainerContext containerContext) throws IOException;
+
+ boolean statusUpdate(TezTaskAttemptID taskId, TezTaskStatus taskStatus)
+ throws IOException, InterruptedException;
+
+ void reportDiagnosticInfo(TezTaskAttemptID taskid, String trace) throws IOException;
+
+ boolean ping(TezTaskAttemptID taskid) throws IOException;
+
+ void done(TezTaskAttemptID taskid) throws IOException;
+
+ void commitPending(TezTaskAttemptID taskId, TezTaskStatus taskStatus)
+ throws IOException, InterruptedException;
+
+ boolean canCommit(TezTaskAttemptID taskid) throws IOException;
+
+ void shuffleError(TezTaskAttemptID taskId, String message) throws IOException;
+
+ void fsError(TezTaskAttemptID taskId, String message) throws IOException;
+
+ void fatalError(TezTaskAttemptID taskId, String message) throws IOException;
+
+ // TODO TEZAM5 Can commitPending and outputReady be collapsed into a single
+ // call.
+ // IAC outputReady followed by commit is a little confusing - since the output
+ // isn't really in place till a commit is called. Maybe rename to
+ // processingComplete or some such.
+
+ // TODO EVENTUALLY This is not the most useful API. Once there's some kind of
+ // support for the Task handing output over to the Container, this won't rally
+ // be required. i.e. InMemShuffle running as a service in the Container, or
+ // the second task in getTask(). ContainerUmbilical would include getTask and
+ // getServices...
+
+ void outputReady(TezTaskAttemptID taskAttemptId, OutputContext outputContext)
+ throws IOException;
+
+ ProceedToCompletionResponse
+ proceedToCompletion(TezTaskAttemptID taskAttemptId) throws IOException;
+}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/EventFetcher.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/EventFetcher.java b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/EventFetcher.java
index ac8ea27..9280423 100644
--- a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/EventFetcher.java
+++ b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/EventFetcher.java
@@ -22,9 +22,9 @@ import java.net.URI;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.tez.dag.records.TezTaskAttemptID;
import org.apache.tez.engine.api.Master;
import org.apache.tez.engine.records.TezDependentTaskCompletionEvent;
-import org.apache.tez.engine.records.TezTaskAttemptID;
import org.apache.tez.engine.records.TezTaskDependencyCompletionEventsUpdate;
class EventFetcher extends Thread {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/Fetcher.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/Fetcher.java b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/Fetcher.java
index 6f6851b..9e905e1 100644
--- a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/Fetcher.java
+++ b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/Fetcher.java
@@ -49,11 +49,11 @@ import org.apache.tez.common.IDUtils;
import org.apache.tez.common.TezJobConfig;
import org.apache.tez.common.TezTaskReporter;
import org.apache.tez.common.counters.TezCounter;
+import org.apache.tez.dag.records.TezTaskAttemptID;
import org.apache.tez.engine.common.ConfigUtils;
import org.apache.tez.engine.common.security.SecureShuffleUtils;
import org.apache.tez.engine.common.shuffle.impl.MapOutput.Type;
import org.apache.tez.engine.common.sort.impl.IFileInputStream;
-import org.apache.tez.engine.records.TezTaskAttemptID;
import com.google.common.annotations.VisibleForTesting;
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/InMemoryReader.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/InMemoryReader.java b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/InMemoryReader.java
index 78db3d5..7cea558 100644
--- a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/InMemoryReader.java
+++ b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/InMemoryReader.java
@@ -26,9 +26,9 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.io.DataOutputBuffer;
+import org.apache.tez.dag.records.TezTaskAttemptID;
import org.apache.tez.engine.common.sort.impl.IFile;
import org.apache.tez.engine.common.sort.impl.IFile.Reader;
-import org.apache.tez.engine.records.TezTaskAttemptID;
/**
* <code>IFile.InMemoryReader</code> to read map-outputs present in-memory.
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MapHost.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MapHost.java b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MapHost.java
index 4c12e2a..544f3b5 100644
--- a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MapHost.java
+++ b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MapHost.java
@@ -20,7 +20,7 @@ package org.apache.tez.engine.common.shuffle.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
class MapHost {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MapOutput.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MapOutput.java b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MapOutput.java
index 41820b3..272709e 100644
--- a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MapOutput.java
+++ b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MapOutput.java
@@ -29,8 +29,8 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocalDirAllocator;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.BoundedByteArrayOutputStream;
+import org.apache.tez.dag.records.TezTaskAttemptID;
import org.apache.tez.engine.common.task.local.output.TezTaskOutputFiles;
-import org.apache.tez.engine.records.TezTaskAttemptID;
class MapOutput {
private static final Log LOG = LogFactory.getLog(MapOutput.class);
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MergeManager.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MergeManager.java b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MergeManager.java
index 9156f28..16ded35 100644
--- a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MergeManager.java
+++ b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/MergeManager.java
@@ -45,6 +45,8 @@ import org.apache.tez.common.Constants;
import org.apache.tez.common.TezJobConfig;
import org.apache.tez.common.TezTaskReporter;
import org.apache.tez.common.counters.TezCounter;
+import org.apache.tez.dag.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskID;
import org.apache.tez.engine.api.Input;
import org.apache.tez.engine.api.Output;
import org.apache.tez.engine.api.Processor;
@@ -57,8 +59,6 @@ import org.apache.tez.engine.common.sort.impl.TezRawKeyValueIterator;
import org.apache.tez.engine.common.sort.impl.IFile.Writer;
import org.apache.tez.engine.common.sort.impl.TezMerger.Segment;
import org.apache.tez.engine.common.task.local.output.TezTaskOutputFiles;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
@InterfaceAudience.Private
@InterfaceStability.Unstable
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/ShuffleClientMetrics.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/ShuffleClientMetrics.java b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/ShuffleClientMetrics.java
index 0188f21..34b26c4 100644
--- a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/ShuffleClientMetrics.java
+++ b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/ShuffleClientMetrics.java
@@ -24,7 +24,7 @@ import org.apache.hadoop.metrics.MetricsUtil;
import org.apache.hadoop.metrics.Updater;
import org.apache.tez.common.Constants;
import org.apache.tez.common.TezJobConfig;
-import org.apache.tez.engine.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
class ShuffleClientMetrics implements Updater {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/ShuffleScheduler.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/ShuffleScheduler.java b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/ShuffleScheduler.java
index d0ce5f5..de20621 100644
--- a/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/ShuffleScheduler.java
+++ b/tez-engine/src/main/java/org/apache/tez/engine/common/shuffle/impl/ShuffleScheduler.java
@@ -39,8 +39,8 @@ import org.apache.hadoop.util.Progress;
import org.apache.tez.common.TezJobConfig;
import org.apache.tez.common.TezTaskStatus;
import org.apache.tez.common.counters.TezCounter;
-import org.apache.tez.engine.records.TezTaskAttemptID;
-import org.apache.tez.engine.records.TezTaskID;
+import org.apache.tez.dag.records.TezTaskAttemptID;
+import org.apache.tez.dag.records.TezTaskID;
class ShuffleScheduler {
static ThreadLocal<Long> shuffleStart = new ThreadLocal<Long>() {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/ExternalSorter.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/ExternalSorter.java b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/ExternalSorter.java
index f6af426..76fc2e9 100644
--- a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/ExternalSorter.java
+++ b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/ExternalSorter.java
@@ -45,6 +45,7 @@ import org.apache.tez.common.TezEngineTaskContext;
import org.apache.tez.common.TezJobConfig;
import org.apache.tez.common.counters.TaskCounter;
import org.apache.tez.common.counters.TezCounter;
+import org.apache.tez.dag.records.TezTaskAttemptID;
import org.apache.tez.engine.api.Input;
import org.apache.tez.engine.api.Master;
import org.apache.tez.engine.api.Output;
@@ -58,7 +59,6 @@ import org.apache.tez.engine.common.sort.impl.IFile.Writer;
import org.apache.tez.engine.common.task.local.output.TezTaskOutput;
import org.apache.tez.engine.common.task.local.output.TezTaskOutputFiles;
import org.apache.tez.engine.records.OutputContext;
-import org.apache.tez.engine.records.TezTaskAttemptID;
@SuppressWarnings({"unchecked", "rawtypes"})
public abstract class ExternalSorter {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/PipelinedSorter.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/PipelinedSorter.java b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/PipelinedSorter.java
index 6ce39da..4da5ffa 100644
--- a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/PipelinedSorter.java
+++ b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/PipelinedSorter.java
@@ -45,13 +45,13 @@ import org.apache.hadoop.util.IndexedSorter;
import org.apache.hadoop.util.Progress;
import org.apache.tez.common.TezEngineTaskContext;
import org.apache.tez.common.TezJobConfig;
+import org.apache.tez.dag.records.TezTaskAttemptID;
import org.apache.tez.engine.api.Master;
import org.apache.tez.engine.common.ConfigUtils;
import org.apache.tez.engine.common.sort.SortingOutput;
import org.apache.tez.engine.common.sort.impl.IFile.Writer;
import org.apache.tez.engine.common.sort.impl.TezMerger.Segment;
import org.apache.tez.engine.records.OutputContext;
-import org.apache.tez.engine.records.TezTaskAttemptID;
@SuppressWarnings({"unchecked", "rawtypes"})
public class PipelinedSorter extends ExternalSorter implements SortingOutput {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java
----------------------------------------------------------------------
diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java
index 0c35760..2cf5ab4 100644
--- a/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java
+++ b/tez-engine/src/main/java/org/apache/tez/engine/common/sort/impl/dflt/DefaultSorter.java
@@ -42,6 +42,7 @@ import org.apache.hadoop.util.StringUtils;
import org.apache.tez.common.TezEngineTaskContext;
import org.apache.tez.common.TezJobConfig;
import org.apache.tez.common.TezTaskContext;
+import org.apache.tez.dag.records.TezTaskAttemptID;
import org.apache.tez.engine.api.Master;
import org.apache.tez.engine.common.ConfigUtils;
import org.apache.tez.engine.common.sort.impl.ExternalSorter;
@@ -53,7 +54,6 @@ import org.apache.tez.engine.common.sort.impl.TezSpillRecord;
import org.apache.tez.engine.common.sort.impl.IFile.Writer;
import org.apache.tez.engine.common.sort.impl.TezMerger.Segment;
import org.apache.tez.engine.records.OutputContext;
-import org.apache.tez.engine.records.TezTaskAttemptID;
@SuppressWarnings({"unchecked", "rawtypes"})
public class DefaultSorter extends ExternalSorter implements IndexedSortable {