You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/03/06 09:12:26 UTC
git commit: TAJO-665: sort buffer size must be dealt as long type
values. (hyoungjunkim via hyunsik)
Repository: incubator-tajo
Updated Branches:
refs/heads/master 4089c9d59 -> 887252b25
TAJO-665: sort buffer size must be dealt as long type values. (hyoungjunkim via hyunsik)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/887252b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/887252b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/887252b2
Branch: refs/heads/master
Commit: 887252b25558710f03002c175723842cd75c17c2
Parents: 4089c9d
Author: Hyunsik Choi <hy...@apache.org>
Authored: Thu Mar 6 17:11:21 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Thu Mar 6 17:11:21 2014 +0900
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../apache/tajo/engine/planner/physical/ExternalSortExec.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/887252b2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 52f4543..26afdc4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -269,6 +269,9 @@ Release 0.8.0 - unreleased
BUG FIXES
+ TAJO-665: sort buffer size must be dealt as long type values.
+ (hyoungjunkim via hyunsik)
+
TAJO-427: Empty table makes IndexOutOfBoundsException at LEFT OUTER JOIN clause. (jaehwa)
TAJO-650: Repartitioner::scheduleHashShuffledFetches should adjust the
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/887252b2/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java
index 4ceb3fc..b871133 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java
@@ -69,7 +69,7 @@ public class ExternalSortExec extends SortExec {
/** the defaultFanout of external sort */
private final int defaultFanout;
/** It's the size of in-memory table. If memory consumption exceeds it, store the memory table into a disk. */
- private int sortBufferBytesNum;
+ private long sortBufferBytesNum;
/** the number of available cores */
private final int allocatedCoreNum;
/** If there are available multiple cores, it tries parallel merge. */
@@ -193,7 +193,7 @@ public class ExternalSortExec extends SortExec {
*/
private List<Path> sortAndStoreAllChunks() throws IOException {
Tuple tuple;
- int memoryConsumption = 0;
+ long memoryConsumption = 0;
List<Path> chunkPaths = TUtil.newList();
int chunkId = 0;