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/10/14 11:20:40 UTC
tajo git commit: TAJO-1917: Conflict on Parquet Libraries.
Repository: tajo
Updated Branches:
refs/heads/master a74134d33 -> f8065b960
TAJO-1917: Conflict on Parquet Libraries.
Closes #813
Signed-off-by: Jihoon Son <ji...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/f8065b96
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/f8065b96
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/f8065b96
Branch: refs/heads/master
Commit: f8065b960848f93af75462c4237968ff54d65d45
Parents: a74134d
Author: Jongyoung Park <em...@gmail.com>
Authored: Wed Oct 14 18:20:15 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Wed Oct 14 18:20:44 2015 +0900
----------------------------------------------------------------------
CHANGES | 3 +++
tajo-dist/pom.xml | 3 +++
tajo-dist/src/main/bin/tajo | 13 ++++++++-----
tajo-storage/tajo-storage-hdfs/pom.xml | 1 -
4 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/f8065b96/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 7e74d3e..1736f36 100644
--- a/CHANGES
+++ b/CHANGES
@@ -338,6 +338,9 @@ Release 0.11.0 - unreleased
BUG FIXES
+ TAJO-1917: Conflict on Parquet Libraries. (Contributed by Jongyoung Park.
+ Committed by jihoon)
+
TAJO-1900: When a record column and its child column are retrieved together,
the record column might not be inferred as record type properly. (jihoon)
http://git-wip-us.apache.org/repos/asf/tajo/blob/f8065b96/tajo-dist/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-dist/pom.xml b/tajo-dist/pom.xml
index 121622d..095f128 100644
--- a/tajo-dist/pom.xml
+++ b/tajo-dist/pom.xml
@@ -154,6 +154,9 @@
run cp -r ${project.basedir}/src/main/conf .
run rm -rf lib/tajo-*-${project.version}.jar
+ run mkdir hive
+ run mv lib/hive-*.jar hive/
+
run mkdir -p share/jdbc-dist
run cp -r $ROOT/tajo-jdbc/target/tajo-jdbc-${project.version}-jar-with-dependencies.jar ./share/jdbc-dist/tajo-jdbc-${project.version}.jar
http://git-wip-us.apache.org/repos/asf/tajo/blob/f8065b96/tajo-dist/src/main/bin/tajo
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/bin/tajo b/tajo-dist/src/main/bin/tajo
index db6c93f..8dbd760 100755
--- a/tajo-dist/src/main/bin/tajo
+++ b/tajo-dist/src/main/bin/tajo
@@ -232,13 +232,13 @@ HDFS_LIBRARY_PATH="${HADOOP_HOME}/lib/native/"
HBASE_CONF=$HBASE_HOME/conf
-if [ -d ${HBASE_CONF} ]; then
+if [ ! -z ${HBASE_HOME} ] && [ -d ${HBASE_HOME} ] && [ -d ${HBASE_CONF} ]; then
CLASSPATH=${HBASE_CONF}:${CLASSPATH}
fi
HBASE_LIB=$HBASE_HOME/lib
-if [ -d ${HBASE_LIB} ]; then
+if [ ! -z ${HBASE_HOME} ] && [ -d ${HBASE_HOME} ] && [ -d ${HBASE_LIB} ]; then
for f in ${HBASE_LIB}/hbase-server-*.jar; do
CLASSPATH=${CLASSPATH}:$f;
@@ -272,13 +272,13 @@ fi
HIVE_CONF=$HIVE_HOME/conf
-if [ -d ${HIVE_CONF} ]; then
+if [ ! -z ${HIVE_HOME} ] && [ -d ${HIVE_HOME} ] && [ -d ${HIVE_CONF} ]; then
CLASSPATH=${HIVE_CONF}:${CLASSPATH}
fi
HIVE_LIB=$HIVE_HOME/lib
-if [ -d ${HIVE_LIB} ]; then
+if [ ! -z ${HIVE_HOME} ] && [ -d ${HIVE_HOME} ] && [ -d ${HIVE_LIB} ]; then
for f in ${HIVE_LIB}/hive-*.jar; do
CLASSPATH=${CLASSPATH}:$f;
@@ -299,7 +299,10 @@ if [ -d ${HIVE_LIB} ]; then
for f in ${HIVE_LIB}/datanucleus-*.jar; do
CLASSPATH=${CLASSPATH}:$f;
done
-
+else
+ for f in $TAJO_HOME/hive/*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+ done
fi
if [ "${HIVE_JDBC_DRIVER_DIR}" != "" ]; then
http://git-wip-us.apache.org/repos/asf/tajo/blob/f8065b96/tajo-storage/tajo-storage-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/pom.xml b/tajo-storage/tajo-storage-hdfs/pom.xml
index 325df22..3d69492 100644
--- a/tajo-storage/tajo-storage-hdfs/pom.xml
+++ b/tajo-storage/tajo-storage-hdfs/pom.xml
@@ -165,7 +165,6 @@
</plugins>
</build>
-
<dependencies>
<dependency>
<groupId>io.netty</groupId>