Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 75510 invoked from network); 19 Sep 2008 23:50:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Sep 2008 23:50:59 -0000 Received: (qmail 32897 invoked by uid 500); 19 Sep 2008 23:50:56 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 32742 invoked by uid 500); 19 Sep 2008 23:50:56 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 32733 invoked by uid 99); 19 Sep 2008 23:50:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Sep 2008 16:50:56 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Sep 2008 23:50:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A63C62388855; Fri, 19 Sep 2008 16:50:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r697287 - in /hadoop/core/trunk: CHANGES.txt src/contrib/hive/bin/hive src/contrib/hive/conf/hive-default.xml Date: Fri, 19 Sep 2008 23:50:38 -0000 To: core-commits@hadoop.apache.org From: dhruba@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080919235038.A63C62388855@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dhruba Date: Fri Sep 19 16:50:38 2008 New Revision: 697287 URL: http://svn.apache.org/viewvc?rev=697287&view=rev Log: HADOOP-4090. The hive scripts pick up hadoop from HADOOP_HOME and then the path. (Raghotham Murthy via dhruba) Modified: hadoop/core/trunk/CHANGES.txt hadoop/core/trunk/src/contrib/hive/bin/hive hadoop/core/trunk/src/contrib/hive/conf/hive-default.xml Modified: hadoop/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=697287&r1=697286&r2=697287&view=diff ============================================================================== --- hadoop/core/trunk/CHANGES.txt (original) +++ hadoop/core/trunk/CHANGES.txt Fri Sep 19 16:50:38 2008 @@ -709,6 +709,9 @@ HADOOP-4120. Hive interactive shell records the time taken by a query. (Raghotham Murthy via dhruba) + HADOOP-4090. The hive scripts pick up hadoop from HADOOP_HOME + and then the path. (Raghotham Murthy via dhruba) + Release 0.18.1 - 2008-09-17 IMPROVEMENTS Modified: hadoop/core/trunk/src/contrib/hive/bin/hive URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/bin/hive?rev=697287&r1=697286&r2=697287&view=diff ============================================================================== --- hadoop/core/trunk/src/contrib/hive/bin/hive (original) +++ hadoop/core/trunk/src/contrib/hive/bin/hive Fri Sep 19 16:50:38 2008 @@ -65,14 +65,19 @@ # pass classpath to hadoop export HADOOP_CLASSPATH=${CLASSPATH} -# point to the first available hadoop instance +# check for hadoop in the path HADOOP_IN_PATH=`which hadoop 2>/dev/null` -HADOOP=${HADOOP:-$HADOOP_IN_PATH} -if [ "$HADOOP" == "" ]; then - echo "Cannot find hadoop installation: 'hadoop' must be in your path or specified via \$HADOOP"; +if [ -f ${HADOOP_IN_PATH} ]; then + HADOOP_DIR=`dirname "$HADOOP_IN_PATH"`/.. +fi +# HADOOP_HOME env variable overrides hadoop in the path +HADOOP_HOME=${HADOOP_HOME:-$HADOOP_DIR} +if [ "$HADOOP_HOME" == "" ]; then + echo "Cannot find hadoop installation: \$HADOOP_HOME must be set or hadoop must be in the path"; exit 4; fi +HADOOP=$HADOOP_HOME/bin/hadoop if [ ! -f ${HADOOP} ]; then echo "Cannot find hadoop installation: \"$HADOOP\" does not exist"; exit 4; Modified: hadoop/core/trunk/src/contrib/hive/conf/hive-default.xml URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/conf/hive-default.xml?rev=697287&r1=697286&r2=697287&view=diff ============================================================================== --- hadoop/core/trunk/src/contrib/hive/conf/hive-default.xml (original) +++ hadoop/core/trunk/src/contrib/hive/conf/hive-default.xml Fri Sep 19 16:50:38 2008 @@ -9,21 +9,6 @@ - - - hadoop.bin.path - ${user.dir}/../../../bin/hadoop - - Path to hadoop binary. Assumes that by default we are executing from hive - - - - hadoop.config.dir - ${user.dir}/../../../conf - - Path to hadoop configuration. Again assumes that by default we are executing from hive/ - - hive.exec.scratchdir