HADOOP-4090. The hive scripts pick up hadoop from HADOOP_HOME

and then the path. (Raghotham Murthy via dhruba)



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

CHANGES.txt

@@ -709,6 +709,9 @@ Trunk (unreleased changes)
     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

src/contrib/hive/bin/hive

@@ -65,14 +65,19 @@ CLASSPATH=${CLASSPATH}:${AUX_CLASSPATH}
 # 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;

src/contrib/hive/conf/hive-default.xml

@@ -9,21 +9,6 @@
 <!-- users do not have to edit hadoop configuration files (that may be managed as a centralized -->
 <!-- resource).                                                                                 -->
 
-<!-- Hadoop Setup -->
-<property>
-  <name>hadoop.bin.path</name>
-  <value>${user.dir}/../../../bin/hadoop</value>
-  <!-- note that the hive shell script also uses this property name -->
-  <description>Path to hadoop binary. Assumes that by default we are executing from hive</description>
-</property>
-
-<property>
-  <name>hadoop.config.dir</name>
-  <value>${user.dir}/../../../conf</value>
-  <!-- note that the hive shell script also uses this property name -->
-  <description>Path to hadoop configuration. Again assumes that by default we are executing from hive/</description>
-</property>
-
 <!-- Hive Execution Parameters -->
 <property>
   <name>hive.exec.scratchdir</name>