Author: hashutosh
Date: Fri Sep 2 00:41:38 2011
New Revision: 1164316
URL: http://svn.apache.org/viewvc?rev=1164316&view=rev
Log:
HCATALOG-91: hcat client not setting the config properly
Modified:
incubator/hcatalog/trunk/CHANGES.txt
incubator/hcatalog/trunk/bin/hcat.sh
Modified: incubator/hcatalog/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1164316&r1=1164315&r2=1164316&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Fri Sep 2 00:41:38 2011
@@ -26,6 +26,8 @@ Trunk (unreleased changes)
IMPROVEMENTS
+ HCAT-91. hcat client not setting the config properly (hashutosh)
+
HCAT-67. Utilities for system testing (hashutosh)
HCAT-64. Refactor HCatTableInfo, JobInfo and OutputJobInfo (toffer via gates)
Modified: incubator/hcatalog/trunk/bin/hcat.sh
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/bin/hcat.sh?rev=1164316&r1=1164315&r2=1164316&view=diff
==============================================================================
--- incubator/hcatalog/trunk/bin/hcat.sh (original)
+++ incubator/hcatalog/trunk/bin/hcat.sh Fri Sep 2 00:41:38 2011
@@ -58,27 +58,10 @@ for jar in $HCAT_HOME/lib/*.jar ; do
done
# Put our config file in the classpath
-HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${HCAT_HOME}/conf/hive-site.xml
+HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${HCAT_HOME}/conf
export HADOOP_CLASSPATH=$HADOOP_CLASSPATH
-# Find our Thrift address from the config file
-THRIFT=`sed -n '/<name>hive.metastore.uris<\/name>/ {
- n
- s/.*<value>\(.*\)<\/value>.*/\1/p
- }' $HCAT_HOME/conf/hive-site.xml`
-HADOOP_OPTS="$HADOOP_OPTS -Dhive.metastore.uris=$THRIFT "
-
-# Find our Warehouse dir from the config file
-WAREHOUSE_DIR=`sed -n '/<name>hive.metastore.warehouse.dir<\/name>/ {
- n
- s/.*<value>\(.*\)<\/value>.*/\1/p
- }' $HCAT_HOME/conf/hive-site.xml`
-HADOOP_OPTS="$HADOOP_OPTS -Dhive.metastore.warehouse.dir=$WAREHOUSE_DIR "
-
-
-export HADOOP_OPTS=$HADOOP_OPTS
-
# run it
if [ "$debug" == "true" ]; then
echo "Would run:"
@@ -89,5 +72,3 @@ else
exec $HADOOP_HOME/bin/hadoop jar $HCAT_JAR
org.apache.hcatalog.cli.HCatCli "$@"
fi
-# Above is the recommended way to launch hcatalog cli. If it doesnt work, you
can try the following:
-# java -Dhive.metastore.uris=thrift://localhost:9083 -cp
../lib/commons-logging-1.0.4.jar:../build/hadoopcore/hadoop-0.20.0/hadoop-0.20.0-core.jar:../lib/commons-cli-2.0-SNAPSHOT.jar:../build/cli/hive-cli-0.7.0.jar:../ql/lib/antlr-runtime-3.0.1.jar:$HCAT_JAR_LOC
org.apache.hcatalog.cli.HCatCli "$@"
