diff --git bin/ext/cli.sh bin/ext/cli.sh index 14337c1c1f..c837508c3c 100644 --- bin/ext/cli.sh +++ bin/ext/cli.sh @@ -24,25 +24,9 @@ fi updateCli() { if [ "$USE_DEPRECATED_CLI" == "true" ]; then - if [ "$USE_BEELINE_FOR_HIVE_CLI" == "true" ]; then - 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` - hadoopClasspath="" - if [[ -n "${HADOOP_CLASSPATH}" ]] - then - hadoopClasspath="${HADOOP_CLASSPATH}:" - fi - export HADOOP_CLASSPATH="${hadoopClasspath}${HIVE_CONF_DIR}:${beelineJarPath}:${superCsvJarPath}:${jlineJarPath}" - export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j.configurationFile=beeline-log4j2.properties " - exec $HADOOP jar ${beelineJarPath} $CLASS $HIVE_OPTS "$@" - else - export HADOOP_CLIENT_OPTS=" -Dproc_hivecli $HADOOP_CLIENT_OPTS " - CLASS=org.apache.hadoop.hive.cli.CliDriver - JAR=hive-cli-*.jar - fi + export HADOOP_CLIENT_OPTS=" -Dproc_hivecli $HADOOP_CLIENT_OPTS " + CLASS=org.apache.hadoop.hive.cli.CliDriver + JAR=hive-cli-*.jar else export HADOOP_CLIENT_OPTS=" -Dproc_beeline $HADOOP_CLIENT_OPTS -Dlog4j.configurationFile=beeline-log4j2.properties" CLASS=org.apache.hive.beeline.cli.HiveCli diff --git bin/hive bin/hive index 87be599023..c54c6fbfbc 100755 --- bin/hive +++ bin/hive @@ -85,6 +85,10 @@ if [ "$SERVICE" = "" ] ; then fi fi +if [[ "$SERVICE" == "cli" && "$USE_BEELINE_FOR_HIVE_CLI" == "true" ]] ; then + SERVICE="beeline" +fi + if [[ "$SERVICE" =~ ^(help|version|orcfiledump|rcfilecat|schemaTool|cleardanglingscratchdir|metastore|beeline|llapstatus|llap)$ ]] ; then SKIP_HBASECP=true fi