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 2015/09/21 08:05:23 UTC

tajo git commit: TAJO-1872: Increase the minimum split size and add a classpath to hadoop tools.

Repository: tajo
Updated Branches:
  refs/heads/master 8f00bf743 -> 21b4797e2


TAJO-1872: Increase the minimum split size and add a classpath to hadoop tools.

Closes #773


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/21b4797e
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/21b4797e
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/21b4797e

Branch: refs/heads/master
Commit: 21b4797e2eabb08ce99af7e206a80f2641b0502a
Parents: 8f00bf7
Author: Jihoon Son <ji...@apache.org>
Authored: Mon Sep 21 15:05:15 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Mon Sep 21 15:05:15 2015 +0900

----------------------------------------------------------------------
 CHANGES                                                      | 3 +++
 tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java | 3 ++-
 tajo-dist/src/main/bin/tajo                                  | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/21b4797e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index a2496c1..2bead97 100644
--- a/CHANGES
+++ b/CHANGES
@@ -556,6 +556,9 @@ Release 0.11.0 - unreleased
   
   TASKS
 
+    TAJO-1872: Increase the minimum split size and add a classpath to hadoop 
+    tools. (jihoon)
+
     TAJO-1870: Enable tests of tajo-storage-pgsql module when arch type 
     is 64-bit. (jinho)
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/21b4797e/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 f9b9201..3210323 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
@@ -29,6 +29,7 @@ import org.apache.tajo.QueryId;
 import org.apache.tajo.SessionVars;
 import org.apache.tajo.TajoConstants;
 import org.apache.tajo.service.BaseServiceTracker;
+import org.apache.tajo.unit.StorageUnit;
 import org.apache.tajo.util.NetUtils;
 import org.apache.tajo.util.NumberUtil;
 import org.apache.tajo.util.TUtil;
@@ -221,7 +222,7 @@ public class TajoConf extends Configuration {
 
     // Storage Configuration --------------------------------------------------
     ROWFILE_SYNC_INTERVAL("rowfile.sync.interval", 100),
-    MINIMUM_SPLIT_SIZE("tajo.min.split.size", (long) 1),
+    MINIMUM_SPLIT_SIZE("tajo.min.split.size", 32 * StorageUnit.MB, Validators.min("1")),
     // for RCFile
     HIVEUSEEXPLICITRCFILEHEADER("tajo.exec.rcfile.use.explicit.header", true, Validators.bool()),
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/21b4797e/tajo-dist/src/main/bin/tajo
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/bin/tajo b/tajo-dist/src/main/bin/tajo
index 58d06fb..db6c93f 100755
--- a/tajo-dist/src/main/bin/tajo
+++ b/tajo-dist/src/main/bin/tajo
@@ -214,7 +214,8 @@ $HADOOP_HOME/share/hadoop/common
 $HADOOP_HOME/share/hadoop/hdfs
 $HADOOP_HOME/share/hadoop/hdfs/lib
 $HADOOP_HOME/share/hadoop/yarn
-$HADOOP_HOME/share/hadoop/mapreduce"
+$HADOOP_HOME/share/hadoop/mapreduce
+$HADOOP_HOME/share/hadoop/tools/lib"
 
 for d in $HADOOP_MODULE_DIRS; do
   CLASSPATH=${CLASSPATH}:$d/*