You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by hi...@apache.org on 2013/11/15 16:25:19 UTC

[2/2] git commit: TEZ-616. OrderedWordCount with -generateSplitsInClient true throws NPE. (hitesh)

TEZ-616. OrderedWordCount with -generateSplitsInClient true throws NPE. (hitesh)


Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/727431fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/727431fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/727431fe

Branch: refs/heads/master
Commit: 727431fe7b0051bcd1b2f3856fa95ef4192daa43
Parents: 8a3dcf4
Author: Hitesh Shah <hi...@apache.org>
Authored: Fri Nov 15 07:24:57 2013 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Fri Nov 15 07:24:57 2013 -0800

----------------------------------------------------------------------
 .../org/apache/tez/mapreduce/examples/OrderedWordCount.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/727431fe/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/OrderedWordCount.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/OrderedWordCount.java b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/OrderedWordCount.java
index 3ffd076..190678f 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/OrderedWordCount.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/mapreduce/examples/OrderedWordCount.java
@@ -20,12 +20,14 @@ package org.apache.tez.mapreduce.examples;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
+import java.util.TreeMap;
 
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.logging.Log;
@@ -383,8 +385,11 @@ public class OrderedWordCount {
             + ", inputPath=" + inputPath
             + ", outputPath=" + outputPath);
 
-        DAG dag = createDAG(fs, conf, null, stagingDir,
-            dagIndex, inputPath, outputPath, generateSplitsInClient);
+        Map<String, LocalResource> localResources =
+          Collections.emptyMap();
+        DAG dag = createDAG(fs, conf, localResources,
+            stagingDir, dagIndex, inputPath, outputPath,
+            generateSplitsInClient);
 
         if (useTezSession) {
           LOG.info("Waiting for TezSession to get into ready state");