hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jd...@apache.org
Subject hive git commit: HIVE-9437 - Beeline does not add any existing HADOOP_CLASSPATH (Ashish via Xuefu)
Date Wed, 12 Aug 2015 19:48:08 GMT
Repository: hive
Updated Branches:
  refs/heads/branch-1.0 35914dbcd -> 4e7260ba3


HIVE-9437 - Beeline does not add any existing HADOOP_CLASSPATH (Ashish via Xuefu)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1659434 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/4e7260ba
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/4e7260ba
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/4e7260ba

Branch: refs/heads/branch-1.0
Commit: 4e7260ba331f36ceaf8c7f9a2795fe2bf71e81f5
Parents: 35914db
Author: Brock Noland <brock@apache.org>
Authored: Thu Feb 12 23:23:18 2015 +0000
Committer: Jason Dere <jdere@hortonworks.com>
Committed: Wed Aug 12 12:43:44 2015 -0700

----------------------------------------------------------------------
 bin/ext/beeline.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/4e7260ba/bin/ext/beeline.sh
----------------------------------------------------------------------
diff --git a/bin/ext/beeline.sh b/bin/ext/beeline.sh
index a957fe1..ab3dc1a 100644
--- a/bin/ext/beeline.sh
+++ b/bin/ext/beeline.sh
@@ -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