hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1659436 - in /hive/branches/branch-1.1: ./ bin/ext/beeline.sh
Date Thu, 12 Feb 2015 23:36:21 GMT
Author: brock
Date: Thu Feb 12 23:36:21 2015
New Revision: 1659436

URL: http://svn.apache.org/r1659436
Log:
HIVE-9437 - Beeline does not add any existing HADOOP_CLASSPATH (Ashish via Xuefu)

Modified:
    hive/branches/branch-1.1/   (props changed)
    hive/branches/branch-1.1/bin/ext/beeline.sh

Propchange: hive/branches/branch-1.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 12 23:36:21 2015
@@ -3,4 +3,4 @@
 /hive/branches/spark:1608589-1654414,1654553,1654869,1654873,1655427,1655468,1655926,1658877
 /hive/branches/tez:1494760-1622766
 /hive/branches/vectorization:1466908-1527856
-/hive/trunk:1655202,1655210,1655213,1655436,1655460,1655894-1655895,1656061,1656114,1656234,1656587,1656780,1657742,1657990,1658221,1658471,1658766,1659027,1659106,1659432
+/hive/trunk:1655202,1655210,1655213,1655436,1655460,1655894-1655895,1656061,1656114,1656234,1656587,1656780,1657742,1657990,1658221,1658471,1658766,1659027,1659106,1659432,1659434

Modified: hive/branches/branch-1.1/bin/ext/beeline.sh
URL: http://svn.apache.org/viewvc/hive/branches/branch-1.1/bin/ext/beeline.sh?rev=1659436&r1=1659435&r2=1659436&view=diff
==============================================================================
--- hive/branches/branch-1.1/bin/ext/beeline.sh (original)
+++ hive/branches/branch-1.1/bin/ext/beeline.sh Thu Feb 12 23:36:21 2015
@@ -25,7 +25,12 @@ beeline () {
   superCsvJarPath=`ls ${HIVE_LIB}/super-csv-*.jar`
   jlineJarPath=`ls ${HIVE_LIB}/jline-*.jar`
   jdbcStandaloneJarPath=`ls ${HIVE_LIB}/hive-jdbc-*-standalone.jar`
-  export HADOOP_CLASSPATH=${HIVE_CONF_DIR}:${beelineJarPath}:${superCsvJarPath}:${jlineJarPath}:${jdbcStandaloneJarPath}
+  hadoopClasspath=""
+  if [[ -n "${HADOOP_CLASSPATH}" ]]
+  then
+    hadoopClasspath="${HADOOP_CLASSPATH}:"
+  fi
+  export HADOOP_CLASSPATH="${hadoopClasspath}${HIVE_CONF_DIR}:${beelineJarPath}:${superCsvJarPath}:${jlineJarPath}:${jdbcStandaloneJarPath}"
   export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j.configuration=beeline-log4j.properties
"
 
   exec $HADOOP jar ${beelineJarPath} $CLASS $HIVE_OPTS "$@"



Mime
View raw message