svn commit: r804482 - in /hadoop/hive/trunk: CHANGES.txt bin/ext/cli.sh

[at...@apache.org]

Author: athusoo
Date: Sat Aug 15 16:31:15 2009
New Revision: 804482

URL: http://svn.apache.org/viewvc?rev=804482&view=rev
Log:
HIVE-737. Support having hadoop jars in HADOOP_HOME/build for running
hive cli. (Johan Oskarsson via athusoo)


Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/bin/ext/cli.sh

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=804482&r1=804481&r2=804482&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Sat Aug 15 16:31:15 2009
@@ -220,7 +220,7 @@
     HIVE-720. Improve ByteStream by removing all synchronized method calls.
     (Yongqiang He via zshao)
 
-    HIVE-454. Support escaping of ; in cli
+    HIVE-454. Support escaping of ; in cli.
     (Edward Capriolo via namit)
 
     HIVE-736. Provide a function in Metastore to return the schema of a table.
@@ -229,9 +229,12 @@
     HIVE-617. Add 'jar' service to hive client shell.
     (Edward Capriolo via rmurthy)
 
-    HIVE-578. Refactor partition pruning
+    HIVE-578. Refactor partition pruning.
     (Ashish Thusoo via namit)
 
+    HIVE-737. Support having hadoop jars in HADOOP_HOME/build for running
+    hive cli. (Johan Oskarsson via athusoo)
+
   OPTIMIZATIONS
 
     HIVE-279. Predicate Pushdown support (Prasad Chakka via athusoo).

Modified: hadoop/hive/trunk/bin/ext/cli.sh
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/bin/ext/cli.sh?rev=804482&r1=804481&r2=804482&view=diff
==============================================================================
--- hadoop/hive/trunk/bin/ext/cli.sh (original)
+++ hadoop/hive/trunk/bin/ext/cli.sh Sat Aug 15 16:31:15 2009
@@ -14,15 +14,17 @@
     HIVE_LIB=`cygpath -w "$HIVE_LIB"`
   fi
   
-  for f in ${HADOOP_HOME}/hadoop*core.jar ${HADOOP_HOME}/lib/hadoop*core.jar; do
+  for f in ${HADOOP_HOME}/hadoop*core.jar ${HADOOP_HOME}/lib/hadoop*core.jar ${HADOOP_HOME}/build/hadoop*core.jar; do
       if [[ ! -f $f ]]; then
           continue;
       fi
       if [[ $f == *17* ]] || [[ $f == *18* ]] || [[ $f == *19* ]]; then
           exec $HADOOP jar $AUX_JARS_CMD_LINE ${HIVE_LIB}/hive_cli.jar $CLASS $HIVE_OPTS "$@"
+          break
       else
           # hadoop 20 or newer - skip the aux_jars option. picked up from hiveconf
           exec $HADOOP jar ${HIVE_LIB}/hive_cli.jar $CLASS $HIVE_OPTS "$@" 
+          break
       fi
   done