You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by zs...@apache.org on 2009/10/20 01:00:52 UTC
svn commit: r826859 - in /hadoop/hive/branches/branch-0.4: CHANGES.txt
bin/ext/cli.sh
Author: zshao
Date: Mon Oct 19 23:00:52 2009
New Revision: 826859
URL: http://svn.apache.org/viewvc?rev=826859&view=rev
Log:
HIVE-890. Fix cli.sh for detecting Hadoop versions. (Paul Huff via zshao)
Modified:
hadoop/hive/branches/branch-0.4/CHANGES.txt
hadoop/hive/branches/branch-0.4/bin/ext/cli.sh
Modified: hadoop/hive/branches/branch-0.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/CHANGES.txt?rev=826859&r1=826858&r2=826859&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.4/CHANGES.txt Mon Oct 19 23:00:52 2009
@@ -1,6 +1,32 @@
Hive Change Log
-Release 0.4.0 - Unreleased
+Release 0.4.1 - Unreleased
+
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ HIVE-884. Metastore Server should call System.exit() on error.
+ (Zheng Shao via pchakka)
+
+ IMPROVEMENTS
+
+ OPTIMIZATIONS
+
+ BUG FIXES
+
+ HIVE-864. Fix map-join memory-leak.
+ (Namit Jain via zshao)
+
+ HIVE-878. Update the hash table entry before flushing in Group By
+ hash aggregation (Zheng Shao via namit)
+
+ HIVE-882. Create a new directory every time for scratch.
+ (Namit Jain via zshao)
+
+ HIVE-890. Fix cli.sh for detecting Hadoop versions. (Paul Huff via zshao)
+
+Release 0.4.0
INCOMPATIBLE CHANGES
@@ -134,9 +160,6 @@
HIVE-857. Transform script should support objects of same type. (Zheng Shao via namit)
- HIVE-884. Metastore Server should call System.exit() on error.
- (Zheng Shao via pchakka)
-
IMPROVEMENTS
HIVE-389. Option to build without ivy (jssarma)
@@ -247,7 +270,6 @@
HIVE-811. Fix Javadocs. (Namit Jain via zshao)
- BUG FIXES
HIVE-381. Fix JDBC HiveResultSet's next function.
(Kim P via namit)
@@ -567,15 +589,6 @@
HIVE-838. In strict mode, remove error if no partition is selected.
(Namit Jain via rmurthy)
- HIVE-864. Fix map-join memory-leak.
- (Namit Jain via zshao)
-
- HIVE-878. Update the hash table entry before flushing in Group By
- hash aggregation (Zheng Shao via namit)
-
- HIVE-882. Create a new directory every time for scratch.
- (Namit Jain via zshao)
-
Release 0.3.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/branches/branch-0.4/bin/ext/cli.sh
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/bin/ext/cli.sh?rev=826859&r1=826858&r2=826859&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/bin/ext/cli.sh (original)
+++ hadoop/hive/branches/branch-0.4/bin/ext/cli.sh Mon Oct 19 23:00:52 2009
@@ -13,20 +13,15 @@
if $cygwin; then
HIVE_LIB=`cygpath -w "$HIVE_LIB"`
fi
-
- 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
+
+ version=$($HADOOP version | awk '{print $2;}');
+
+ if [[ $version =~ "^0\.17" ]] || [[ $version =~ "^0\.18" ]] || [[ $version =~ "^0.19" ]]; then
+ exec $HADOOP jar $AUX_JARS_CMD_LINE ${HIVE_LIB}/hive_cli.jar $CLASS $HIVE_OPTS "$@"
+ 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 "$@"
+ fi
}