You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2014/08/01 07:59:01 UTC
[08/14] git commit: TAJO-952: Wrong default partition volume config.
(Mai Hai Thanh via jihoon)
TAJO-952: Wrong default partition volume config. (Mai Hai Thanh via jihoon)
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/b49ff30b
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/b49ff30b
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/b49ff30b
Branch: refs/heads/index_support
Commit: b49ff30b9a3da97d347e8e08798affceac79e6bb
Parents: 3cfc198
Author: Jihoon Son <ji...@apache.org>
Authored: Tue Jul 29 11:13:14 2014 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Tue Jul 29 11:13:14 2014 +0900
----------------------------------------------------------------------
CHANGES | 2 ++
tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java | 3 +--
.../java/org/apache/tajo/master/querymaster/Repartitioner.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/b49ff30b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 9dac2c7..95747a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -97,6 +97,8 @@ Release 0.9.0 - unreleased
BUG FIXES
+ TAJO-952: Wrong default partition volume config. (Mai Hai Thanh via jihoon)
+
TAJO-974: Eliminate unexpected case condition in SubQuery. (Hyoungjun Kim
via hyunsik)
http://git-wip-us.apache.org/repos/asf/tajo/blob/b49ff30b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
index 83ff9ed..a8e6d8d 100644
--- a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
+++ b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
@@ -249,8 +249,7 @@ public class TajoConf extends Configuration {
DIST_QUERY_SORT_PARTITION_VOLUME("tajo.dist-query.sort.partition-volume-mb", 256),
DIST_QUERY_GROUPBY_PARTITION_VOLUME("tajo.dist-query.groupby.partition-volume-mb", 256),
- DIST_QUERY_TABLE_PARTITION_VOLUME("tajo.dist-query.table-partition.task-volume-mb",
- 256 * 1024 * 1024),
+ DIST_QUERY_TABLE_PARTITION_VOLUME("tajo.dist-query.table-partition.task-volume-mb", 256),
//////////////////////////////////
// Physical Executors
http://git-wip-us.apache.org/repos/asf/tajo/blob/b49ff30b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java
index 6eebbde..f86106f 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java
@@ -773,8 +773,8 @@ public class Repartitioner {
SubQuery subQuery, Map<ExecutionBlockId, List<IntermediateEntry>> intermediates,
String tableName) {
int i = 0;
- int splitVolume = subQuery.getContext().getConf().
- getIntVar(ConfVars.DIST_QUERY_TABLE_PARTITION_VOLUME);
+ long splitVolume = ((long) 1048576) * subQuery.getContext().getConf().
+ getIntVar(ConfVars.DIST_QUERY_TABLE_PARTITION_VOLUME); // in bytes
long sumNumBytes = 0L;
Map<Integer, List<FetchImpl>> fetches = new HashMap<Integer, List<FetchImpl>>();