Repository: tajo Updated Branches: refs/heads/branch-0.8.0 5ca3dfc81 -> 4dc22f760
TAJO-735: Remove multiple SLF4J bindings message. (hyoungjunkim via hyunsik) Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/4dc22f76 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/4dc22f76 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/4dc22f76 Branch: refs/heads/branch-0.8.0 Commit: 4dc22f76039b77eccf434094d2f3d65433814721 Parents: 5ca3dfc Author: Hyunsik Choi <[email protected]> Authored: Fri Apr 4 12:24:03 2014 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Fri Apr 4 12:26:01 2014 +0900 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ tajo-dist/src/main/bin/tajo | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/4dc22f76/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 3fa3b83..9925663 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -143,6 +143,8 @@ Release 0.8.0 - unreleased IMPROVEMENTS + TAJO-735: Remove multiple SLF4J bindings message. (hyoungjunkim via hyunsik) + TAJO-714: Enable setting Parquet tuning parameters. (David Chen via hyunsik) TAJO-691: HashJoin or HashAggregation is too slow if there is many unique keys. http://git-wip-us.apache.org/repos/asf/tajo/blob/4dc22f76/tajo-dist/src/main/bin/tajo ---------------------------------------------------------------------- diff --git a/tajo-dist/src/main/bin/tajo b/tajo-dist/src/main/bin/tajo index 77d4a02..24dce60 100755 --- a/tajo-dist/src/main/bin/tajo +++ b/tajo-dist/src/main/bin/tajo @@ -281,8 +281,9 @@ TAJO_BASE_CLASSPATH="${TAJO_CONF_DIR}" TAJO_JAR_DIRS="$TAJO_HOME ${TAJO_HOME}/lib" +# We need to avoid the inclusion of slf4 twice. for d in $TAJO_JAR_DIRS; do - for j in `find $d/*.jar ! -name "*test*"`; do + for j in `find $d/*.jar ! -name "*test*" | grep -v slf4`; do TAJO_BASE_CLASSPATH=$TAJO_BASE_CLASSPATH:$j done done @@ -402,4 +403,4 @@ TAJO_OPTS="$TAJO_OPTS -Dtajo.policy.file=$TAJO_POLICYFILE" # run it export CLASSPATH=$CLASSPATH -exec "$JAVA" -Dproc_$COMMAND $TAJO_OPTS $CLASS $TAJO_DAEMON_MODE "$@" \ No newline at end of file +exec "$JAVA" -Dproc_$COMMAND $TAJO_OPTS $CLASS $TAJO_DAEMON_MODE "$@"
