tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbalamo...@apache.org
Subject tez git commit: TEZ-1800 Integer overflow in ExternalSorter.getInitialMemoryRequirement() (Rajesh Balamohan) (Cherry picked from commit 79edb49b245bb274ddb377d53683187f8a640a0d)
Date Thu, 11 Dec 2014 03:01:48 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.5 20c04e553 -> 1fb43bd29


TEZ-1800 Integer overflow in ExternalSorter.getInitialMemoryRequirement() (Rajesh Balamohan)
(Cherry picked from commit 79edb49b245bb274ddb377d53683187f8a640a0d)

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/branch-0.5
Commit: 1fb43bd29e20b1718e6652c5175ffe9b2d05fac1
Parents: 20c04e5
Author: Rajesh Balamohan <rbalamohan@hortonworks.com>
Authored: Tue Nov 25 05:42:26 2014 +0530
Committer: Rajesh Balamohan <rbalamohan@hortonworks.com>
Committed: Thu Dec 11 08:28:13 2014 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                     | 5 +++++
 .../tez/runtime/library/common/sort/impl/ExternalSorter.java    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/1fb43bd2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 50233b5..35c48f9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Apache Tez Change Log
 =====================
 
+Release 0.5.4: Unreleased
+
+ALL CHANGES:
+  TEZ-1800. Integer overflow in ExternalSorter.getInitialMemoryRequirement()
+
 Release 0.5.3: Unreleased
 
 ALL CHANGES:

http://git-wip-us.apache.org/repos/asf/tez/blob/1fb43bd2/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java
b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java
index f100f23..c73fc49 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/sort/impl/ExternalSorter.java
@@ -287,7 +287,7 @@ public abstract class ExternalSorter {
             TezRuntimeConfiguration.TEZ_RUNTIME_IO_SORT_MB, 
             TezRuntimeConfiguration.TEZ_RUNTIME_IO_SORT_MB_DEFAULT);
     Preconditions.checkArgument(initialMemRequestMb != 0, "io.sort.mb should be larger than
0");
-    long reqBytes = initialMemRequestMb << 20;
+    long reqBytes = ((long) initialMemRequestMb) << 20;
     LOG.info("Requested SortBufferSize (io.sort.mb): " + initialMemRequestMb);
     return reqBytes;
   }


Mime
View raw message