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 2014/03/20 00:47:29 UTC
git commit: TEZ-953. Port MAPREDUCE-5493. (sseth)
Repository: incubator-tez
Updated Branches:
refs/heads/master 90a056d64 -> 4669d71cf
TEZ-953. Port MAPREDUCE-5493. (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/4669d71c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/4669d71c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/4669d71c
Branch: refs/heads/master
Commit: 4669d71cf3728fa1bda0bc23a8068ee102ac8e87
Parents: 90a056d
Author: Siddharth Seth <ss...@apache.org>
Authored: Wed Mar 19 16:45:12 2014 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Wed Mar 19 16:47:22 2014 -0700
----------------------------------------------------------------------
.../tez/runtime/library/common/shuffle/impl/MergeManager.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/4669d71c/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/MergeManager.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/MergeManager.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/MergeManager.java
index b9c5fba..8071b36 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/MergeManager.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/MergeManager.java
@@ -468,8 +468,11 @@ public class MergeManager {
List<MapOutput> memory =
new ArrayList<MapOutput>(inMemoryMergedMapOutputs);
+ inMemoryMergedMapOutputs.clear();
memory.addAll(inMemoryMapOutputs);
+ inMemoryMapOutputs.clear();
List<Path> disk = new ArrayList<Path>(onDiskMapOutputs);
+ onDiskMapOutputs.clear();
TezRawKeyValueIterator kvIter = finalMerge(conf, rfs, memory, disk);
this.finalMergeComplete = true;
return kvIter;