From 0ee0b9afa810960b9bc6fb61c71338e39d25c346 Mon Sep 17 00:00:00 2001 From: Deepesh Khandelwal Date: Fri, 19 Sep 2014 16:33:01 -0700 Subject: [PATCH] HIVE-8200: Make beeline use the hive-jdbc standalone jar --- bin/beeline.cmd | 17 ++++++++++++++++- bin/ext/beeline.sh | 14 ++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/bin/beeline.cmd b/bin/beeline.cmd index 0438e56..8687444 100644 --- a/bin/beeline.cmd +++ b/bin/beeline.cmd @@ -43,7 +43,22 @@ if not exist %HADOOP_HOME%\libexec\hadoop-config.cmd ( @rem supress the HADOOP_HOME warnings in 1.x.x set HADOOP_HOME_WARN_SUPPRESS=true call %HADOOP_HOME%\libexec\hadoop-config.cmd -set CLASSPATH=%CLASSPATH%;%HIVE_HOME%\lib\*; + +@rem include only the beeline client jar and its dependencies +pushd %HIVE_HOME%\lib +for /f %%a IN ('dir /b hive-beeline-**.jar') do ( + set CLASSPATH=%CLASSPATH%;%HIVE_HOME%\lib\%%a +) +for /f %%a IN ('dir /b super-csv-**.jar') do ( + set CLASSPATH=%CLASSPATH%;%HIVE_HOME%\lib\%%a +) +for /f %%a IN ('dir /b jline-**.jar') do ( + set CLASSPATH=%CLASSPATH%;%HIVE_HOME%\lib\%%a +) +for /f %%a IN ('dir /b hive-jdbc-**-standalone.jar') do ( + set CLASSPATH=%CLASSPATH%;%HIVE_HOME%\lib\%%a +) +popd call %JAVA_HOME%\bin\java %JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% org.apache.hive.beeline.BeeLine %* diff --git a/bin/ext/beeline.sh b/bin/ext/beeline.sh index 6c0435d..ddd5906 100644 --- a/bin/ext/beeline.sh +++ b/bin/ext/beeline.sh @@ -19,11 +19,17 @@ export SERVICE_LIST="${SERVICE_LIST}${THISSERVICE} " beeline () { CLASS=org.apache.hive.beeline.BeeLine; - execHiveCmd $CLASS "$@" + + # include only the beeline client jar and its dependencies + beelineJarPath=`ls ${HIVE_LIB}/hive-beeline-*.jar` + superCsvJarPath=`ls ${HIVE_LIB}/super-csv-*.jar` + jlineJarPath=`ls ${HIVE_LIB}/jline-*.jar` + jdbcStandaloneJarPath=`ls ${HIVE_LIB}/hive-jdbc-*-standalone.jar` + export HADOOP_CLASSPATH=${beelineJarPath}:${superCsvJarPath}:${jlineJarPath}:${jdbcStandaloneJarPath} + + exec $HADOOP jar ${beelineJarPath} $CLASS $HIVE_OPTS "$@" } beeline_help () { - CLASS=org.apache.hive.beeline.BeeLine; - execHiveCmd $CLASS "--help" + beeline "--help" } - -- 1.8.5.2 (Apple Git-48)