Repository: tez Updated Branches: refs/heads/master 19378d5c2 -> 5de0fb123
TEZ-2323. Fix TestOrderedWordcount to use MR memory configs. (hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/5de0fb12 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/5de0fb12 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/5de0fb12 Branch: refs/heads/master Commit: 5de0fb123991b716a810ce7d122faf474fe64243 Parents: 19378d5 Author: Hitesh Shah <[email protected]> Authored: Wed Apr 15 17:59:15 2015 -0700 Committer: Hitesh Shah <[email protected]> Committed: Wed Apr 15 17:59:15 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/tez/mapreduce/examples/TestOrderedWordCount.java | 6 +++--- .../src/test/java/org/apache/tez/test/TestSecureShuffle.java | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/5de0fb12/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 56f6ea9..4cd4557 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ INCOMPATIBLE CHANGES TEZ-1993. Implement a pluggable InputSizeEstimator for grouping fairly ALL CHANGES: + TEZ-2323. Fix TestOrderedWordcount to use MR memory configs. TEZ-1482. Fix memory issues for Local Mode running concurrent tasks TEZ-2033. Update TestOrderedWordCount to add processor configs as history text and use MR configs correctly http://git-wip-us.apache.org/repos/asf/tez/blob/5de0fb12/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java index 4a05dab..eb56795 100644 --- a/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java +++ b/tez-tests/src/main/java/org/apache/tez/mapreduce/examples/TestOrderedWordCount.java @@ -283,7 +283,7 @@ public class TestOrderedWordCount extends Configured implements Tool { OrderedPartitionedKVEdgeConfig edgeConf1 = OrderedPartitionedKVEdgeConfig .newBuilder(Text.class.getName(), IntWritable.class.getName(), - HashPartitioner.class.getName()).setFromConfiguration(conf) + HashPartitioner.class.getName()).setFromConfiguration(iReduceStageConf) .configureInput().useLegacyInput().done().build(); dag.addEdge( Edge.create(dag.getVertex("initialmap"), dag.getVertex("intermediate_reducer"), @@ -291,7 +291,7 @@ public class TestOrderedWordCount extends Configured implements Tool { OrderedPartitionedKVEdgeConfig edgeConf2 = OrderedPartitionedKVEdgeConfig .newBuilder(IntWritable.class.getName(), Text.class.getName(), - HashPartitioner.class.getName()).setFromConfiguration(conf) + HashPartitioner.class.getName()).setFromConfiguration(finalReduceConf) .configureInput().useLegacyInput().done().build(); dag.addEdge( Edge.create(dag.getVertex("intermediate_reducer"), dag.getVertex("finalreduce"), @@ -443,7 +443,7 @@ public class TestOrderedWordCount extends Configured implements Tool { Map<String, LocalResource> localResources = new TreeMap<String, LocalResource>(); - DAG dag = instance.createDAG(fs, conf, localResources, + DAG dag = instance.createDAG(fs, tezConf, localResources, stagingDir, dagIndex, inputPath, outputPath, generateSplitsInClient, useMRSettings, intermediateNumReduceTasks); http://git-wip-us.apache.org/repos/asf/tez/blob/5de0fb12/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java ---------------------------------------------------------------------- diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java b/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java index 37a8ef6..a0f7d8b 100644 --- a/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java +++ b/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java @@ -140,7 +140,8 @@ public class TestSecureShuffle { TestOrderedWordCount wordCount = new TestOrderedWordCount(); wordCount.setConf(new Configuration(miniTezCluster.getConfig())); - String[] args = new String[] { inputLoc.toString(), outputLoc.toString() }; + String[] args = new String[] { "-DUSE_MR_CONFIGS=false", + inputLoc.toString(), outputLoc.toString() }; assertEquals(expectedResult, wordCount.run(args)); }
