tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ss...@apache.org
Subject git commit: TEZ-1040. Fix a bug which could cause the Merger to hang. (sseth)
Date Fri, 11 Apr 2014 18:04:17 GMT
Repository: incubator-tez
Updated Branches:
  refs/heads/master 5f58ecad2 -> 0ecf1d136


TEZ-1040. Fix a bug which could cause the Merger to hang. (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/0ecf1d13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/0ecf1d13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/0ecf1d13

Branch: refs/heads/master
Commit: 0ecf1d13672aa4d58a106e1258c16f24a2b59af1
Parents: 5f58eca
Author: Siddharth Seth <sseth@apache.org>
Authored: Fri Apr 11 11:03:42 2014 -0700
Committer: Siddharth Seth <sseth@apache.org>
Committed: Fri Apr 11 11:03:42 2014 -0700

----------------------------------------------------------------------
 .../org/apache/tez/runtime/library/common/sort/impl/TezMerger.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/0ecf1d13/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/TezMerger.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/TezMerger.java
b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/TezMerger.java
index ee62b70..be21280 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/TezMerger.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/TezMerger.java
@@ -813,6 +813,8 @@ public class TezMerger {
         }
         segmentSizes.add(pos, mergedSize);
 
+        n -= (f-1);
+        f = factor;
       }
 
       return totalBytes;


Mime
View raw message