From hcatalog-commits-return-445-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org  Tue Sep  6 14:50:07 2011
Return-Path: <hcatalog-commits-return-445-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 08A447570
	for <apmail-incubator-hcatalog-commits-archive@minotaur.apache.org>; Tue,  6 Sep 2011 14:50:07 +0000 (UTC)
Received: (qmail 19238 invoked by uid 500); 6 Sep 2011 14:50:06 -0000
Delivered-To: apmail-incubator-hcatalog-commits-archive@incubator.apache.org
Received: (qmail 19199 invoked by uid 500); 6 Sep 2011 14:50:06 -0000
Mailing-List: contact hcatalog-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:hcatalog-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:hcatalog-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:hcatalog-commits@incubator.apache.org>
List-Id: <hcatalog-commits.incubator.apache.org>
Reply-To: hcatalog-dev@incubator.apache.org
Delivered-To: mailing list hcatalog-commits@incubator.apache.org
Received: (qmail 19192 invoked by uid 99); 6 Sep 2011 14:50:05 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Sep 2011 14:50:05 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Sep 2011 14:50:04 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 3EA4A23889B3;
	Tue,  6 Sep 2011 14:49:44 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1165689 - in /incubator/hcatalog/branches/branch-0.2:
 CHANGES.txt bin/hcat.sh
Date: Tue, 06 Sep 2011 14:49:44 -0000
To: hcatalog-commits@incubator.apache.org
From: hashutosh@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110906144944.3EA4A23889B3@eris.apache.org>

Author: hashutosh
Date: Tue Sep  6 14:49:43 2011
New Revision: 1165689

URL: http://svn.apache.org/viewvc?rev=1165689&view=rev
Log:
HCAT-91: hcat client not setting the config properly

Modified:
    incubator/hcatalog/branches/branch-0.2/CHANGES.txt
    incubator/hcatalog/branches/branch-0.2/bin/hcat.sh

Modified: incubator/hcatalog/branches/branch-0.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.2/CHANGES.txt?rev=1165689&r1=1165688&r2=1165689&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.2/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.2/CHANGES.txt Tue Sep  6 14:49:43 2011
@@ -33,6 +33,8 @@ Release 0.2.0 - Unreleased
     (Krishna Kumar via macyang)
     
   IMPROVEMENTS
+    HCAT-91. hcat client not setting the config properly (hashutosh)
+
     HCAT-66. HCatalog 0.2.0 Documentation (chandec via hashutosh)
 
     HCAT-54. Javadoc is not being built as part of HCatalog docs (hashutosh) 

Modified: incubator/hcatalog/branches/branch-0.2/bin/hcat.sh
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.2/bin/hcat.sh?rev=1165689&r1=1165688&r2=1165689&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.2/bin/hcat.sh (original)
+++ incubator/hcatalog/branches/branch-0.2/bin/hcat.sh Tue Sep  6 14:49:43 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 "$@"