diff --git a/bin/beeline.cmd b/bin/beeline.cmd index 8687444..0438e56 100644 --- a/bin/beeline.cmd +++ b/bin/beeline.cmd @@ -43,22 +43,7 @@ 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 - -@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 +set CLASSPATH=%CLASSPATH%;%HIVE_HOME%\lib\*; 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 ddd5906..6c0435d 100644 --- a/bin/ext/beeline.sh +++ b/bin/ext/beeline.sh @@ -19,17 +19,11 @@ export SERVICE_LIST="${SERVICE_LIST}${THISSERVICE} " beeline () { CLASS=org.apache.hive.beeline.BeeLine; - - # 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 "$@" + execHiveCmd $CLASS "$@" } beeline_help () { - beeline "--help" + CLASS=org.apache.hive.beeline.BeeLine; + execHiveCmd $CLASS "--help" } +