Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D23117778 for ; Thu, 12 Feb 2015 23:36:44 +0000 (UTC) Received: (qmail 14120 invoked by uid 500); 12 Feb 2015 23:36:22 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 14082 invoked by uid 500); 12 Feb 2015 23:36:22 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 14071 invoked by uid 99); 12 Feb 2015 23:36:22 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Feb 2015 23:36:22 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 0CA6EAC006D for ; Thu, 12 Feb 2015 23:36:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1659436 - in /hive/branches/branch-1.1: ./ bin/ext/beeline.sh Date: Thu, 12 Feb 2015 23:36:21 -0000 To: commits@hive.apache.org From: brock@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150212233622.0CA6EAC006D@hades.apache.org> 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 "$@"