http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezLocalTaskOutputFiles.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezLocalTaskOutputFiles.java b/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezLocalTaskOutputFiles.java index 12ad74c..ccfbd78 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezLocalTaskOutputFiles.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezLocalTaskOutputFiles.java @@ -28,7 +28,7 @@ import org.apache.hadoop.fs.LocalDirAllocator; import org.apache.hadoop.fs.Path; import org.apache.tez.common.Constants; import org.apache.tez.common.TezJobConfig; -import org.apache.tez.engine.records.TezTaskID; +import org.apache.tez.dag.records.TezTaskID; /** * Manipulate the working area for the transient store for maps and reduces.
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezTaskOutput.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezTaskOutput.java b/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezTaskOutput.java index 9f6e10b..eb1fe5f 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezTaskOutput.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezTaskOutput.java @@ -25,7 +25,7 @@ import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.fs.Path; -import org.apache.tez.engine.records.TezTaskID; +import org.apache.tez.dag.records.TezTaskID; /** * Manipulate the working area for the transient store for maps and reduces. http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezTaskOutputFiles.java ---------------------------------------------------------------------- diff --git a/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezTaskOutputFiles.java b/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezTaskOutputFiles.java index eeca130..1bd65e2 100644 --- a/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezTaskOutputFiles.java +++ b/tez-engine/src/main/java/org/apache/tez/engine/common/task/local/output/TezTaskOutputFiles.java @@ -29,7 +29,7 @@ import org.apache.hadoop.fs.LocalDirAllocator; import org.apache.hadoop.fs.Path; import org.apache.tez.common.Constants; import org.apache.tez.common.TezJobConfig; -import org.apache.tez.engine.records.TezTaskID; +import org.apache.tez.dag.records.TezTaskID; /** * Manipulate the working area for the transient store for maps and reduces. http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/tez-mapreduce/pom.xml b/tez-mapreduce/pom.xml index 2a1ca15..e785f6b 100644 --- a/tez-mapreduce/pom.xml +++ b/tez-mapreduce/pom.xml @@ -27,11 +27,15 @@ <dependencies> <dependency> <groupId>org.apache.tez</groupId> - <artifactId>tez-engine</artifactId> + <artifactId>tez-dag-api</artifactId> </dependency> <dependency> <groupId>org.apache.tez</groupId> - <artifactId>tez-dag-api</artifactId> + <artifactId>tez-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tez</groupId> + <artifactId>tez-engine</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java b/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java index 9dfaf1f..63472d2 100644 --- a/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java +++ b/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/LocalJobRunner.java @@ -71,13 +71,13 @@ import org.apache.tez.common.TezTaskStatus; import org.apache.tez.common.TezTaskUmbilicalProtocol; import org.apache.tez.common.counters.TezCounters; import org.apache.tez.common.records.ProceedToCompletionResponse; +import org.apache.tez.dag.records.TezTaskAttemptID; import org.apache.tez.engine.api.Task; import org.apache.tez.engine.common.task.local.output.TezLocalTaskOutputFiles; import org.apache.tez.engine.common.task.local.output.TezTaskOutput; import org.apache.tez.engine.lib.input.LocalMergedInput; import org.apache.tez.engine.lib.output.LocalOnFileSorterOutput; import org.apache.tez.engine.records.OutputContext; -import org.apache.tez.engine.records.TezTaskAttemptID; import org.apache.tez.engine.records.TezTaskDependencyCompletionEventsUpdate; import org.apache.tez.engine.runtime.RuntimeUtils; import org.apache.tez.mapreduce.hadoop.IDConverter; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java index 050f608..b8a99ee 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java @@ -38,6 +38,7 @@ import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.ReflectionUtils; import org.apache.tez.common.TezTaskUmbilicalProtocol; import org.apache.tez.common.counters.TaskCounter; +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; @@ -46,7 +47,6 @@ import org.apache.tez.engine.common.ConfigUtils; import org.apache.tez.engine.common.combine.CombineInput; import org.apache.tez.engine.common.combine.CombineOutput; import org.apache.tez.engine.common.sort.impl.TezRawKeyValueIterator; -import org.apache.tez.engine.records.TezTaskAttemptID; import org.apache.tez.mapreduce.hadoop.IDConverter; import org.apache.tez.mapreduce.hadoop.mapred.TaskAttemptContextImpl; import org.apache.tez.mapreduce.processor.MRTask; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/IDConverter.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/IDConverter.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/IDConverter.java index 4c56bc4..4046596 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/IDConverter.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/IDConverter.java @@ -24,10 +24,10 @@ import org.apache.hadoop.mapred.TaskID; import org.apache.hadoop.mapreduce.TaskType; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.util.BuilderUtils; -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.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; public class IDConverter { http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRTaskStatus.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRTaskStatus.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRTaskStatus.java index b5c06eb..e63b704 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRTaskStatus.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRTaskStatus.java @@ -30,7 +30,7 @@ import org.apache.hadoop.io.WritableUtils; import org.apache.hadoop.mapred.TaskStatus; import org.apache.tez.common.TezTaskStatus; import org.apache.tez.common.counters.TezCounters; -import org.apache.tez.engine.records.TezTaskAttemptID; +import org.apache.tez.dag.records.TezTaskAttemptID; public class MRTaskStatus implements TezTaskStatus { http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/TezTypeConverters.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/TezTypeConverters.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/TezTypeConverters.java index 0b2774d..1fc71b0 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/TezTypeConverters.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/TezTypeConverters.java @@ -28,9 +28,9 @@ import org.apache.tez.common.TezTaskStatus.Phase; import org.apache.tez.common.counters.CounterGroup; import org.apache.tez.common.counters.TezCounter; import org.apache.tez.common.counters.TezCounters; -import org.apache.tez.engine.records.TezDAGID; +import org.apache.tez.dag.records.TezDAGID; +import org.apache.tez.dag.records.TezTaskAttemptID; import org.apache.tez.engine.records.TezDependentTaskCompletionEvent; -import org.apache.tez.engine.records.TezTaskAttemptID; public class TezTypeConverters { http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/JobContextImpl.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/JobContextImpl.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/JobContextImpl.java index a3e31b0..2f06986 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/JobContextImpl.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/JobContextImpl.java @@ -23,7 +23,7 @@ import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.JobContext; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.util.Progressable; -import org.apache.tez.engine.records.TezDAGID; +import org.apache.tez.dag.records.TezDAGID; import org.apache.tez.mapreduce.hadoop.IDConverter; @InterfaceAudience.Private http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/TaskAttemptContextImpl.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/TaskAttemptContextImpl.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/TaskAttemptContextImpl.java index aacfc60..d953891 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/TaskAttemptContextImpl.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/TaskAttemptContextImpl.java @@ -26,7 +26,7 @@ import org.apache.hadoop.mapred.TaskID; import org.apache.hadoop.mapreduce.Counter; import org.apache.hadoop.mapreduce.TaskType; import org.apache.hadoop.util.Progressable; -import org.apache.tez.engine.records.TezTaskAttemptID; +import org.apache.tez.dag.records.TezTaskAttemptID; import org.apache.tez.mapreduce.processor.MRTaskReporter; @InterfaceAudience.Private http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/JobContextImpl.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/JobContextImpl.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/JobContextImpl.java index d27f996..1f34fdb 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/JobContextImpl.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapreduce/JobContextImpl.java @@ -43,7 +43,7 @@ import org.apache.hadoop.mapreduce.lib.partition.HashPartitioner; import org.apache.hadoop.security.Credentials; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.Progressable; -import org.apache.tez.engine.records.TezDAGID; +import org.apache.tez.dag.records.TezDAGID; import org.apache.tez.mapreduce.hadoop.IDConverter; import org.apache.tez.mapreduce.hadoop.MRJobConfig; import org.apache.tez.mapreduce.processor.MRTaskReporter; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java index bd39b67..d7d721f 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java @@ -63,11 +63,11 @@ import org.apache.tez.common.counters.TaskCounter; import org.apache.tez.common.counters.TezCounter; import org.apache.tez.common.counters.TezCounters; import org.apache.tez.common.records.ProceedToCompletionResponse; +import org.apache.tez.dag.records.TezDAGID; +import org.apache.tez.dag.records.TezTaskAttemptID; import org.apache.tez.engine.api.Master; import org.apache.tez.engine.common.sort.impl.TezRawKeyValueIterator; import org.apache.tez.engine.records.OutputContext; -import org.apache.tez.engine.records.TezDAGID; -import org.apache.tez.engine.records.TezTaskAttemptID; import org.apache.tez.mapreduce.combine.MRCombiner; import org.apache.tez.mapreduce.hadoop.IDConverter; import org.apache.tez.mapreduce.hadoop.MRConfig; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/TezTaskReporterImpl.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/TezTaskReporterImpl.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/TezTaskReporterImpl.java index c601109..d602459 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/TezTaskReporterImpl.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/TezTaskReporterImpl.java @@ -31,7 +31,7 @@ import org.apache.hadoop.util.ReflectionUtils; import org.apache.hadoop.util.StringUtils; import org.apache.tez.common.TezTaskUmbilicalProtocol; import org.apache.tez.common.counters.TezCounter; -import org.apache.tez.engine.records.TezTaskAttemptID; +import org.apache.tez.dag.records.TezTaskAttemptID; import org.apache.tez.engine.records.TezTaskDependencyCompletionEventsUpdate; @InterfaceAudience.Private http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestUmbilicalProtocol.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestUmbilicalProtocol.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestUmbilicalProtocol.java index 4796646..025bf61 100644 --- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestUmbilicalProtocol.java +++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestUmbilicalProtocol.java @@ -28,8 +28,8 @@ import org.apache.tez.common.ContainerTask; import org.apache.tez.common.TezTaskStatus; import org.apache.tez.common.TezTaskUmbilicalProtocol; import org.apache.tez.common.records.ProceedToCompletionResponse; +import org.apache.tez.dag.records.TezTaskAttemptID; import org.apache.tez.engine.records.OutputContext; -import org.apache.tez.engine.records.TezTaskAttemptID; import org.apache.tez.engine.records.TezTaskDependencyCompletionEventsUpdate; public class TestUmbilicalProtocol implements TezTaskUmbilicalProtocol { http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8193b5fd/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TezTestUtils.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TezTestUtils.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TezTestUtils.java index 4b04d13..2e823e6 100644 --- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TezTestUtils.java +++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TezTestUtils.java @@ -18,10 +18,10 @@ package org.apache.tez.mapreduce; import org.apache.hadoop.yarn.util.BuilderUtils; -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.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; public class TezTestUtils {
