You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by at...@apache.org on 2009/08/07 22:34:32 UTC
svn commit: r802173 - in /hadoop/hive/trunk: CHANGES.txt bin/ext/cli.sh
bin/ext/hiveserver.sh bin/ext/hwi.sh bin/ext/lineage.sh bin/hive
Author: athusoo
Date: Fri Aug 7 20:34:31 2009
New Revision: 802173
URL: http://svn.apache.org/viewvc?rev=802173&view=rev
Log:
HIVE-344. Fixes for running Hive under cygwin.
(Amr Awadallah via athusoo)
Modified:
hadoop/hive/trunk/CHANGES.txt
hadoop/hive/trunk/bin/ext/cli.sh
hadoop/hive/trunk/bin/ext/hiveserver.sh
hadoop/hive/trunk/bin/ext/hwi.sh
hadoop/hive/trunk/bin/ext/lineage.sh
hadoop/hive/trunk/bin/hive
Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=802173&r1=802172&r2=802173&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Fri Aug 7 20:34:31 2009
@@ -477,6 +477,9 @@
HIVE-711. test for negative double value.
(Karan Mangla via namit)
+ HIVE-344. Fixes for running Hive under cygwin.
+ (Amr Awadallah via athusoo)
+
Release 0.3.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/trunk/bin/ext/cli.sh
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/bin/ext/cli.sh?rev=802173&r1=802172&r2=802173&view=diff
==============================================================================
--- hadoop/hive/trunk/bin/ext/cli.sh (original)
+++ hadoop/hive/trunk/bin/ext/cli.sh Fri Aug 7 20:34:31 2009
@@ -9,6 +9,10 @@
echo "Missing Hive CLI Jar"
exit 3;
fi
+
+ if $cygwin; then
+ HIVE_LIB=`cygpath -w "$HIVE_LIB"`
+ fi
for f in ${HADOOP_HOME}/hadoop*core.jar ${HADOOP_HOME}/lib/hadoop*core.jar; do
if [[ ! -f $f ]]; then
Modified: hadoop/hive/trunk/bin/ext/hiveserver.sh
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/bin/ext/hiveserver.sh?rev=802173&r1=802172&r2=802173&view=diff
==============================================================================
--- hadoop/hive/trunk/bin/ext/hiveserver.sh (original)
+++ hadoop/hive/trunk/bin/ext/hiveserver.sh Fri Aug 7 20:34:31 2009
@@ -4,6 +4,9 @@
hiveserver() {
echo "Starting Hive Thrift Server"
CLASS=org.apache.hadoop.hive.service.HiveServer
+ if $cygwin; then
+ HIVE_LIB=`cygpath -w "$HIVE_LIB"`
+ fi
JAR=${HIVE_LIB}/hive_service.jar
if [ "$HIVE_PORT" != "" ]; then
HIVE_OPTS=$HIVE_PORT
Modified: hadoop/hive/trunk/bin/ext/hwi.sh
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/bin/ext/hwi.sh?rev=802173&r1=802172&r2=802173&view=diff
==============================================================================
--- hadoop/hive/trunk/bin/ext/hwi.sh (original)
+++ hadoop/hive/trunk/bin/ext/hwi.sh Fri Aug 7 20:34:31 2009
@@ -3,6 +3,10 @@
hwi() {
+ if $cygwin; then
+ HIVE_LIB=`cygpath -w "$HIVE_LIB"`
+ fi
+
CLASS=org.apache.hadoop.hive.hwi.HWIServer
export HWI_JAR_FILE=${HIVE_LIB}/hive_hwi.jar
export HWI_WAR_FILE=${HIVE_LIB}/hive_hwi.war
Modified: hadoop/hive/trunk/bin/ext/lineage.sh
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/bin/ext/lineage.sh?rev=802173&r1=802172&r2=802173&view=diff
==============================================================================
--- hadoop/hive/trunk/bin/ext/lineage.sh (original)
+++ hadoop/hive/trunk/bin/ext/lineage.sh Fri Aug 7 20:34:31 2009
@@ -24,6 +24,11 @@
echo "Missing Hive exec Jar"
exit 3;
fi
+
+ if $cygwin; then
+ HIVE_LIB=`cygpath -w "$HIVE_LIB"`
+ fi
+
exec $HADOOP jar ${HIVE_LIB}/hive_exec.jar $CLASS "$@"
}
Modified: hadoop/hive/trunk/bin/hive
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/bin/hive?rev=802173&r1=802172&r2=802173&view=diff
==============================================================================
--- hadoop/hive/trunk/bin/hive (original)
+++ hadoop/hive/trunk/bin/hive Fri Aug 7 20:34:31 2009
@@ -15,6 +15,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+cygwin=false
+case "`uname`" in
+ CYGWIN*) cygwin=true;;
+esac
+
bin=`dirname "$0"`
bin=`cd "$bin"; pwd`
@@ -51,6 +56,9 @@
if [[ ! -f $f ]]; then
continue;
fi
+ if $cygwin; then
+ f=`cygpath -w "$f"`
+ fi
AUX_CLASSPATH=${AUX_CLASSPATH}:$f
if [ "${AUX_PARAM}" == "" ]; then
AUX_PARAM=file://$f
@@ -59,6 +67,11 @@
fi
done
elif [ "${HIVE_AUX_JARS_PATH}" != "" ]; then
+ if $cygwin; then
+ HIVE_AUX_JARS_PATH=`echo $HIVE_AUX_JARS_PATH | sed 's/,/:/g'`
+ HIVE_AUX_JARS_PATH=`cygpath -p -w "$HIVE_AUX_JARS_PATH"`
+ HIVE_AUX_JARS_PATH=`echo $HIVE_AUX_JARS_PATH | sed 's/;/,/g'`
+ fi
AUX_CLASSPATH=${HIVE_AUX_JARS_PATH}
AUX_PARAM=file://${HIVE_AUX_JARS_PATH}
AUX_PARAM=`echo $AUX_PARAM | sed 's/,/,file:\/\//g'`
@@ -69,7 +82,9 @@
if [[ ! -f $f ]]; then
continue;
fi
-
+ if $cygwin; then
+ f=`cygpath -w "$f"`
+ fi
AUX_CLASSPATH=${AUX_CLASSPATH}:$f
if [ "${AUX_PARAM}" == "" ]; then
AUX_PARAM=file://$f
@@ -77,7 +92,12 @@
AUX_PARAM=${AUX_PARAM},file://$f;
fi
done
-CLASSPATH=${CLASSPATH}:${AUX_CLASSPATH}
+if $cygwin; then
+ CLASSPATH=`cygpath -p -w "$CLASSPATH"`
+ CLASSPATH=${CLASSPATH};${AUX_CLASSPATH}
+else
+ CLASSPATH=${CLASSPATH}:${AUX_CLASSPATH}
+fi
# pass classpath to hadoop
export HADOOP_CLASSPATH=${CLASSPATH}