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/01/17 02:15:15 UTC
git commit: TAJO-499: Shorten the length of classpath in shell
command. (hyoungjunkim via hyunsik)
Updated Branches:
refs/heads/master 69700bfc0 -> 35a710379
TAJO-499: Shorten the length of classpath in shell command. (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/35a71037
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/35a71037
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/35a71037
Branch: refs/heads/master
Commit: 35a710379d41f5d31f7c3928e33ed3ffed51cc7f
Parents: 69700bf
Author: Hyunsik Choi <hy...@apache.org>
Authored: Fri Jan 17 10:14:41 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Fri Jan 17 10:14:41 2014 +0900
----------------------------------------------------------------------
CHANGES.txt | 3 +++
tajo-dist/src/main/bin/tajo | 27 ++++++++-------------------
2 files changed, 11 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/35a71037/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 78d635f..49c5392 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -117,6 +117,9 @@ Release 0.8.0 - unreleased
IMPROVEMENTS
+ TAJO-499: Shorten the length of classpath in shell command.
+ (hyoungjunkim via hyunsik)
+
TAJO-483: Add getParentCount(), getParents(), getParent() functions to DirectedGraph.
(jihoon)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/35a71037/tajo-dist/src/main/bin/tajo
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/bin/tajo b/tajo-dist/src/main/bin/tajo
index f965142..6b93203 100755
--- a/tajo-dist/src/main/bin/tajo
+++ b/tajo-dist/src/main/bin/tajo
@@ -209,9 +209,6 @@ IFS=$'\n'
# TAJO_BASE_CLASSPATH contains $TAJO_CONF_DIR before containing jars.
TAJO_BASE_CLASSPATH="${TAJO_CONF_DIR}"
-for f in $TAJO_CONF_DIR/*.xml; do
- TAJO_BASE_CLASSPATH=${TAJO_BASE_CLASSPATH}:$f;
-done
# Tajo Jar Directory
TAJO_JAR_DIRS="$TAJO_HOME
@@ -240,10 +237,6 @@ HIVE_CONF=$HIVE_HOME/conf
if [ -d ${HIVE_CONF} ]; then
CLASSPATH=${CLASSPATH}:${HIVE_CONF}
-
- for f in ${HIVE_CONF}/hive-site.xml; do
- CLASSPATH=${CLASSPATH}:$f;
- done
fi
HIVE_LIB=$HIVE_HOME/lib
@@ -284,22 +277,17 @@ fi
##############################################################################
# HADOOP JAR DIRS
-HADOOP_MODULE_DIRS="$HADOOP_HOME/share/hadoop/common/lib/
-$HADOOP_HOME/share/hadoop/common/
+HADOOP_MODULE_DIRS="$HADOOP_HOME/share/hadoop/common/lib
+$HADOOP_HOME/share/hadoop/common
$HADOOP_HOME/share/hadoop/hdfs
-$HADOOP_HOME/share/hadoop/hdfs/lib/
-$HADOOP_HOME/share/hadoop/yarn/lib/
-$HADOOP_HOME/share/hadoop/yarn/"
+$HADOOP_HOME/share/hadoop/hdfs/lib
+$HADOOP_HOME/share/hadoop/yarn/lib
+$HADOOP_HOME/share/hadoop/yarn"
HADOOP_EXT_CLASSPATH="${HADOOP_CONF_DIR}"
-for f in $HADOOP_CONF_DIR/*.xml; do
- HADOOP_EXT_CLASSPATH=${HADOOP_EXT_CLASSPATH}:$f
-done;
for d in $HADOOP_MODULE_DIRS; do
- for j in `find $d/*.jar ! -name "*test*"`; do
- CLASSPATH=${CLASSPATH}:$j
- done;
+ CLASSPATH=${CLASSPATH}:$d/*
done;
export HADOOP_EXT_CLASSPATH
@@ -413,4 +401,5 @@ fi
TAJO_OPTS="$TAJO_OPTS -Dtajo.policy.file=$TAJO_POLICYFILE"
# run it
-exec "$JAVA" -Dproc_$COMMAND $TAJO_OPTS -classpath "$CLASSPATH" $CLASS $TAJO_DAEMON_MODE "$@"
+export CLASSPATH=$CLASSPATH
+exec "$JAVA" -Dproc_$COMMAND $TAJO_OPTS $CLASS $TAJO_DAEMON_MODE "$@"
\ No newline at end of file