Repository: incubator-impala Updated Branches: refs/heads/master 22669e23b -> a485d44fd
IMPALA-3223: Update path to Postgres JDBC driver Maven has been downloading the postgres JDBC driver all along. So, let's use the one in fe/target/dependency instead of the one in thirdparty. Change-Id: I76bce18fd308890e66615c8d08d5e58f02a8a132 Reviewed-on: http://gerrit.cloudera.org:8080/3232 Reviewed-by: Alex Behm <[email protected]> Tested-by: Internal Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/a485d44f Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/a485d44f Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/a485d44f Branch: refs/heads/master Commit: a485d44fd0277e2b388620d879d1a7cf9d293b47 Parents: 22669e2 Author: Michael Ho <[email protected]> Authored: Thu May 26 16:25:52 2016 -0700 Committer: Tim Armstrong <[email protected]> Committed: Fri May 27 08:42:17 2016 -0700 ---------------------------------------------------------------------- bin/impala-config.sh | 19 ++++++++----------- testdata/bin/load-hive-builtins.sh | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/a485d44f/bin/impala-config.sh ---------------------------------------------------------------------- diff --git a/bin/impala-config.sh b/bin/impala-config.sh index ac1da08..dc0ba13 100755 --- a/bin/impala-config.sh +++ b/bin/impala-config.sh @@ -240,6 +240,7 @@ export IMPALA_LLVM_ASAN_VERSION=3.8.0 export IMPALA_LZ4_VERSION=svn export IMPALA_OPENLDAP_VERSION=2.4.25 export IMPALA_OPENSSL_VERSION=0.9.8zf +export IMPALA_POSTGRES_JDBC_DRIVER_VERSION=9.0-801 export IMPALA_RAPIDJSON_VERSION=0.11 export IMPALA_RE2_VERSION=20130115 export IMPALA_SNAPPY_VERSION=1.1.3 @@ -331,21 +332,16 @@ export PATH=$HIVE_HOME/bin:$PATH export HIVE_CONF_DIR=$IMPALA_FE_DIR/src/test/resources # Hive looks for jar files in a single directory from HIVE_AUX_JARS_PATH plus -# any jars in AUX_CLASSPATH. (Or a list of jars in HIVE_AUX_JARS_PATH.) Find the -# Postgresql jdbc driver required for starting the Hive Metastore. -JDBC_DRIVER=$(find $IMPALA_HOME/thirdparty/postgresql-jdbc -name '*postgres*jdbc*jar' | head -n 1) -if [[ -z "$JDBC_DRIVER" ]]; then - echo Could not find Postgres JDBC driver in >&2 - return -fi -export HIVE_AUX_JARS_PATH="$JDBC_DRIVER" +# any jars in AUX_CLASSPATH. (Or a list of jars in HIVE_AUX_JARS_PATH.) +# The Postgres JDBC driver is downloaded by maven when building the frontend. +# Export the location of Postgres JDBC driver so Sentry can pick it up. +export POSTGRES_JDBC_DRIVER=${IMPALA_FE_DIR}/target/dependency/postgresql-${IMPALA_POSTGRES_JDBC_DRIVER_VERSION}.jdbc4.jar + +export HIVE_AUX_JARS_PATH="$POSTGRES_JDBC_DRIVER" export AUX_CLASSPATH="${LZO_JAR_PATH}" ### Tell hive not to use jline export HADOOP_USER_CLASSPATH_FIRST=true -# Export the location of Postgres JDBC driver so Sentry can pick it up. -export POSTGRES_JDBC_DRIVER="$JDBC_DRIVER" - export HBASE_HOME=$IMPALA_HOME/thirdparty/hbase-${IMPALA_HBASE_VERSION}/ export PATH=$HBASE_HOME/bin:$PATH @@ -460,6 +456,7 @@ echo "PYTHONPATH = $PYTHONPATH" echo "JAVA_HOME = $JAVA_HOME" echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH" echo "LD_PRELOAD = $LD_PRELOAD" +echo "POSTGRES_JDBC_DRIVER = $POSTGRES_JDBC_DRIVER" echo "IMPALA_TOOLCHAIN = $IMPALA_TOOLCHAIN" # Kerberos things. If the cluster exists and is kerberized, source http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/a485d44f/testdata/bin/load-hive-builtins.sh ---------------------------------------------------------------------- diff --git a/testdata/bin/load-hive-builtins.sh b/testdata/bin/load-hive-builtins.sh index 45deb03..4d4ef5a 100755 --- a/testdata/bin/load-hive-builtins.sh +++ b/testdata/bin/load-hive-builtins.sh @@ -42,5 +42,5 @@ ${HADOOP_HOME}/bin/hadoop fs -put ${SENTRY_HOME}/lib/*.jar ${FILESYSTEM_PREFIX}$ ${HADOOP_HOME}/bin/hadoop fs -rm -r -f ${FILESYSTEM_PREFIX}${IMPALA_HOME}/thirdparty/postgresql-jdbc/ ${HADOOP_HOME}/bin/hadoop fs -mkdir -p ${FILESYSTEM_PREFIX}${IMPALA_HOME}/thirdparty/postgresql-jdbc/ -${HADOOP_HOME}/bin/hadoop fs -put ${IMPALA_HOME}/thirdparty/postgresql-jdbc/*.jar \ +${HADOOP_HOME}/bin/hadoop fs -put ${POSTGRES_JDBC_DRIVER} \ ${FILESYSTEM_PREFIX}${IMPALA_HOME}/thirdparty/postgresql-jdbc/
