You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by je...@apache.org on 2014/12/10 04:30:22 UTC
[12/27] tez git commit: TEZ-1800 Integer overflow in
ExternalSorter.getInitialMemoryRequirement() (Rajesh Balamohan)
TEZ-1800 Integer overflow in ExternalSorter.getInitialMemoryRequirement() (Rajesh Balamohan)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/79edb49b
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/79edb49b
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/79edb49b
Branch: refs/heads/TEZ-8
Commit: 79edb49b245bb274ddb377d53683187f8a640a0d
Parents: 7541243
Author: Rajesh Balamohan <rb...@hortonworks.com>
Authored: Tue Nov 25 05:42:26 2014 +0530
Committer: Rajesh Balamohan <rb...@hortonworks.com>
Committed: Tue Nov 25 05:42:26 2014 +0530
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../tez/runtime/library/common/sort/impl/ExternalSorter.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/79edb49b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0ac7605..13f1d53 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,6 +25,7 @@ ALL CHANGES:
TEZ-1797. Create necessary content for Tez DOAP file.
TEZ-1650. Please create a DOAP file for your TLP.
TEZ-1697. DAG submission fails if a local resource added is already part of tez.lib.uris
+ TEZ-1800. Integer overflow in ExternalSorter.getInitialMemoryRequirement()
Release 0.5.3: Unreleased
http://git-wip-us.apache.org/repos/asf/tez/blob/79edb49b/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;
}