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/09/21 21:12:31 UTC
git commit: TEZ-477. Fix NPEs etc caused by TEZ-433 (part of
TEZ-398). (sseth)
Updated Branches:
refs/heads/TEZ-398 9a7e7bccb -> 5eb0c86f2
TEZ-477. Fix NPEs etc caused by TEZ-433 (part of TEZ-398). (sseth)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/5eb0c86f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/5eb0c86f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/5eb0c86f
Branch: refs/heads/TEZ-398
Commit: 5eb0c86f204aad1354e55192bc82e17320949acf
Parents: 9a7e7bc
Author: Siddharth Seth <ss...@apache.org>
Authored: Sat Sep 21 12:11:54 2013 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Sat Sep 21 12:11:54 2013 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/mapred/YarnTezDagChild.java | 2 +-
.../tez/mapreduce/hadoop/MultiStageMRConfToTezTranslator.java | 2 +-
.../java/org/apache/tez/mapreduce/newcombine/MRCombiner.java | 6 +++---
.../java/org/apache/tez/mapreduce/newoutput/SimpleOutput.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/5eb0c86f/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java b/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
index c749850..2d3e4d1 100644
--- a/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
+++ b/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
@@ -514,7 +514,7 @@ public class YarnTezDagChild {
}
String [] localDirs = StringUtils.getTrimmedStrings(System.getenv(Environment.LOCAL_DIRS.name()));
conf.setStrings(TezJobConfig.LOCAL_DIRS, localDirs);
- LOG.info("LocalDirs for child: " + localDirs);
+ LOG.info("LocalDirs for child: " + Arrays.toString(localDirs));
return new LogicalIOProcessorRuntimeTask(taskSpec, attemptNum, conf,
tezUmbilical, jobToken);
}
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/5eb0c86f/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MultiStageMRConfToTezTranslator.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MultiStageMRConfToTezTranslator.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MultiStageMRConfToTezTranslator.java
index ad231b3..d768312 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MultiStageMRConfToTezTranslator.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MultiStageMRConfToTezTranslator.java
@@ -240,9 +240,9 @@ public class MultiStageMRConfToTezTranslator {
Configuration confs[] = new Configuration[numStages];
Configuration nonItermediateConf = MultiStageMRConfigUtil.extractStageConf(
conf, "");
- confs[0].setBoolean(MRConfig.IS_MAP_PROCESSOR, true);
if (numStages == 1) {
confs[0] = nonItermediateConf;
+ confs[0].setBoolean(MRConfig.IS_MAP_PROCESSOR, true);
} else {
confs[0] = nonItermediateConf;
confs[numStages - 1] = new Configuration(nonItermediateConf);
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/5eb0c86f/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newcombine/MRCombiner.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newcombine/MRCombiner.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newcombine/MRCombiner.java
index 788019a..5566fd8 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newcombine/MRCombiner.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newcombine/MRCombiner.java
@@ -49,7 +49,7 @@ import org.apache.tez.engine.common.sort.impl.IFile.Writer;
import org.apache.tez.engine.common.sort.impl.TezRawKeyValueIterator;
import org.apache.tez.engine.newapi.TezInputContext;
import org.apache.tez.engine.newapi.TezOutputContext;
-import org.apache.tez.engine.newapi.impl.TezTaskContextImpl;
+import org.apache.tez.engine.newapi.TezTaskContext;
import org.apache.tez.mapreduce.hadoop.MRConfig;
import org.apache.tez.mapreduce.hadoop.MRJobConfig;
import org.apache.tez.mapreduce.hadoop.mapred.MRCounters;
@@ -72,13 +72,13 @@ public class MRCombiner implements Combiner {
private final MRTaskReporter reporter;
private final TaskAttemptID mrTaskAttemptID;
- public MRCombiner(TezTaskContextImpl taskContext) throws IOException {
+ public MRCombiner(TezTaskContext taskContext) throws IOException {
this.conf = TezUtils.createConfFromUserPayload(taskContext.getUserPayload());
assert(taskContext instanceof TezInputContext || taskContext instanceof TezOutputContext);
if (taskContext instanceof TezOutputContext) {
this.keyClass = ConfigUtils.getIntermediateOutputKeyClass(conf);
- this.valClass = ConfigUtils.getIntermediateOutputKeyClass(conf);
+ this.valClass = ConfigUtils.getIntermediateOutputValueClass(conf);
this.comparator = ConfigUtils.getIntermediateOutputKeyComparator(conf);
this.reporter = new MRTaskReporter((TezOutputContext)taskContext);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/5eb0c86f/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newoutput/SimpleOutput.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newoutput/SimpleOutput.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newoutput/SimpleOutput.java
index 1dd94e1..a8fb900 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newoutput/SimpleOutput.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/newoutput/SimpleOutput.java
@@ -166,7 +166,7 @@ public class SimpleOutput implements LogicalOutput {
initCommitter(jobConf, useNewApi);
LOG.info("Initialized Simple Output"
- + ", using_new_api" + useNewApi);
+ + ", using_new_api: " + useNewApi);
return null;
}