Modified: incubator/tez/branches/TEZ-1/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java URL: http://svn.apache.org/viewvc/incubator/tez/branches/TEZ-1/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java?rev=1470653&r1=1470652&r2=1470653&view=diff ============================================================================== --- incubator/tez/branches/TEZ-1/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java (original) +++ incubator/tez/branches/TEZ-1/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/reduce/ReduceProcessor.java Mon Apr 22 18:28:58 2013 @@ -33,9 +33,8 @@ import org.apache.hadoop.mapreduce.TaskA import org.apache.hadoop.util.Progress; import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.ReflectionUtils; -import org.apache.tez.common.TezEngineTask; +import org.apache.tez.common.TezEngineTaskContext; import org.apache.tez.common.TezJobConfig; -import org.apache.tez.common.TezTask; import org.apache.tez.common.TezTaskStatus; import org.apache.tez.common.counters.TaskCounter; import org.apache.tez.common.counters.TezCounter; @@ -74,10 +73,10 @@ implements Processor { @Inject public ReduceProcessor( - @Assisted TezTask context + @Assisted TezEngineTaskContext context ) { super(context); - TezEngineTask tezEngineContext = (TezEngineTask) context; + TezEngineTaskContext tezEngineContext = (TezEngineTaskContext) context; Preconditions.checkNotNull(tezEngineContext.getInputSpecList(), "InputSpecList should not be null"); Preconditions.checkArgument( @@ -100,7 +99,8 @@ implements Processor { throws IOException, InterruptedException { MRTaskReporter reporter = new MRTaskReporter(getTaskReporter()); boolean useNewApi = jobConf.getUseNewMapper(); - initTask(jobConf, getDAGID(), reporter, useNewApi); + initTask(jobConf, taskAttemptId.getTaskID().getVertexID().getDAGId(), + reporter, useNewApi); if (in instanceof SimpleInput) { ((SimpleInput)in).setTask(this); @@ -291,7 +291,7 @@ implements Processor { // make a task context so we can get the classes org.apache.hadoop.mapreduce.TaskAttemptContext taskContext = - new TaskAttemptContextImpl(job, getTaskAttemptId(), reporter); + new TaskAttemptContextImpl(job, taskAttemptId, reporter); // make a reducer org.apache.hadoop.mapreduce.Reducer reducer = @@ -316,7 +316,7 @@ implements Processor { org.apache.hadoop.mapreduce.Reducer.Context reducerContext = createReduceContext( - reducer, job, getTaskAttemptId(), + reducer, job, taskAttemptId, rIter, reduceInputKeyCounter, reduceInputValueCounter, trackedRW,
Modified: incubator/tez/branches/TEZ-1/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestTaskModules.java URL: http://svn.apache.org/viewvc/incubator/tez/branches/TEZ-1/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestTaskModules.java?rev=1470653&r1=1470652&r2=1470653&view=diff ============================================================================== --- incubator/tez/branches/TEZ-1/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestTaskModules.java (original) +++ incubator/tez/branches/TEZ-1/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TestTaskModules.java Mon Apr 22 18:28:58 2013 @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapred.JobConf; -import org.apache.tez.common.TezEngineTask; +import org.apache.tez.common.TezEngineTaskContext; import org.apache.tez.engine.api.Input; import org.apache.tez.engine.api.Master; import org.apache.tez.engine.api.Output; @@ -59,12 +59,12 @@ public class TestTaskModules { private static final Log LOG = LogFactory.getLog(TestTaskModules.class); - TezEngineTask taskContext; + TezEngineTaskContext taskContext; JobConf job; @Before public void setUp() { - taskContext = new TezEngineTask(TezTestUtils.getMockTaskAttemptId(0, 0, 0, + taskContext = new TezEngineTaskContext(TezTestUtils.getMockTaskAttemptId(0, 0, 0, MRTaskType.REDUCE), "tez", "tez", "TODO_vertexName", TestInitialModule.class.getName(), null, null); job = new JobConf(); Modified: incubator/tez/branches/TEZ-1/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java URL: http://svn.apache.org/viewvc/incubator/tez/branches/TEZ-1/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java?rev=1470653&r1=1470652&r2=1470653&view=diff ============================================================================== --- incubator/tez/branches/TEZ-1/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java (original) +++ incubator/tez/branches/TEZ-1/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java Mon Apr 22 18:28:58 2013 @@ -38,7 +38,7 @@ import org.apache.hadoop.mapred.InputSpl import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.SequenceFileInputFormat; import org.apache.hadoop.mapreduce.split.JobSplit.TaskSplitIndex; -import org.apache.tez.common.TezEngineTask; +import org.apache.tez.common.TezEngineTaskContext; import org.apache.tez.engine.api.Task; import org.apache.tez.engine.runtime.TezEngineFactory; import org.apache.tez.mapreduce.TezTestUtils; @@ -97,8 +97,8 @@ public class MapUtils { throws Exception { jobConf.setInputFormat(SequenceFileInputFormat.class); InputSplit split = createInputSplit(fs, workDir, jobConf, mapInput); - TezEngineTask taskContext = - new TezEngineTask( + TezEngineTaskContext taskContext = + new TezEngineTaskContext( TezTestUtils.getMockTaskAttemptId(0, mapId, 0, MRTaskType.MAP), "tez", "tez", "TODO_vertexName", InitialTaskWithLocalSort.class.getName(), null, null); Modified: incubator/tez/branches/TEZ-1/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java URL: http://svn.apache.org/viewvc/incubator/tez/branches/TEZ-1/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java?rev=1470653&r1=1470652&r2=1470653&view=diff ============================================================================== --- incubator/tez/branches/TEZ-1/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java (original) +++ incubator/tez/branches/TEZ-1/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java Mon Apr 22 18:28:58 2013 @@ -29,7 +29,7 @@ import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.JobContext; import org.apache.tez.common.Constants; import org.apache.tez.common.InputSpec; -import org.apache.tez.common.TezEngineTask; +import org.apache.tez.common.TezEngineTaskContext; import org.apache.tez.common.TezJobConfig; import org.apache.tez.engine.api.Task; import org.apache.tez.engine.common.task.local.output.TezLocalTaskOutputFiles; @@ -94,7 +94,7 @@ public class TestReduceProcessor { FileOutputFormat.setOutputPath(job, new Path(workDir, "output")); // Now run a reduce - TezEngineTask taskContext = new TezEngineTask( + TezEngineTaskContext taskContext = new TezEngineTaskContext( TezTestUtils.getMockTaskAttemptId(0, 0, 0, MRTaskType.REDUCE), "tez", "tez", "TODO_vertexName", LocalFinalTask.class.getName(), Collections.singletonList(new InputSpec("TODO_srcVertexName", 1)), null);
