You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hcatalog-commits@incubator.apache.org by ma...@apache.org on 2011/06/09 21:43:36 UTC
svn commit: r1134097 - in /incubator/hcatalog/trunk: CHANGES.txt build.xml
conf/proto-hive-site.xml scripts/hcat_server_install.sh
Author: macyang
Date: Thu Jun 9 21:43:35 2011
New Revision: 1134097
URL: http://svn.apache.org/viewvc?rev=1134097&view=rev
Log:
HCAT-40. Remove dependencies from the HCatalog client jar (macyang)
Modified:
incubator/hcatalog/trunk/CHANGES.txt
incubator/hcatalog/trunk/build.xml
incubator/hcatalog/trunk/conf/proto-hive-site.xml
incubator/hcatalog/trunk/scripts/hcat_server_install.sh
Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1134097&r1=1134096&r2=1134097&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Thu Jun 9 21:43:35 2011
@@ -13,6 +13,8 @@ Trunk (unreleased changes)
IMPROVEMENTS
+ HCAT-40. Remove dependencies from the HCatalog client jar (macyang)
+
HCAT-37. Misc. build.xml changes (macyang via hashutosh)
HCAT-27. Start and stop scripts for the server (gates)
Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1134097&r1=1134096&r2=1134097&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Thu Jun 9 21:43:35 2011
@@ -32,7 +32,6 @@
<!-- hive properties -->
<property name="hive.root" value="${basedir}/hive/external"/>
- <property name="hive.version" value="0.8.0-SNAPSHOT"/>
<!-- build properties -->
<property name="lib.dir" value="${basedir}/lib/" />
@@ -225,15 +224,10 @@
<antcall target="model-enhance" />
</target>
- <!-- Build the jar, this is the default -->
- <target name="fatjar" depends="compile-src">
+ <!-- Build the hcatalog client jar -->
+ <target name="clientjar" depends="compile-src">
<jar jarfile="${build.dir}/${ant.project.name}/${hcatalog.jar}" basedir="${build.classes}">
- <zipgroupfileset dir="${hive.root}/lib" includes="thrift-fb303-${thrift-fb303.version}.jar,thrift-${thrift.version}.jar,commons-lang-2.4.jar,derby.jar"/>
- <zipgroupfileset dir="${hive.root}/build/metastore" includes="hive-metastore-${hive.version}.jar"/>
- <zipgroupfileset dir="${hive.root}/build/ql" includes="hive-exec-${hive.version}.jar"/>
- <zipgroupfileset dir="${hive.root}/build/common" includes="hive-common-${hive.version}.jar"/>
- <zipgroupfileset dir="${hive.root}/build/serde" includes="hive-serde-${hive.version}.jar"/>
- </jar>
+ </jar>
</target>
<!--
@@ -250,10 +244,10 @@
<!--
================================================================================
- Build both fatjar and server-extensions
+ Build both clientjar and server-extensions
================================================================================
-->
- <target name="jar" depends="fatjar,server-extensions"/>
+ <target name="jar" depends="clientjar,server-extensions"/>
<!--
@@ -287,7 +281,7 @@
================================================================================
-->
<!-- Build HCatalog test files -->
- <target name="compile-test" depends="fatjar">
+ <target name="compile-test" depends="clientjar">
<javac encoding="${build.encoding}" srcdir="${test.src.dir}" excludes="${excludes}"
includes="**/*.java" destdir="${test.build.classes}" debug="${javac.debug}"
optimize="${javac.optimize}" target="${javac.version}"
@@ -380,7 +374,7 @@
Distribution Section
===============================================================================
-->
- <target name="package" depends="fatjar, docs" description="Create an HCatalog release">
+ <target name="package" depends="clientjar, docs" description="Create an HCatalog release">
<mkdir dir="${dist.dir}" />
<mkdir dir="${dist.dir}/lib" />
<mkdir dir="${dist.dir}/conf" />
@@ -396,7 +390,9 @@
<copy todir="${dist.dir}/lib" includeEmptyDirs="false">
<fileset dir="${lib.dir}"/>
- <fileset file="hcatalog-*.jar"/>
+ <fileset dir="${build.dir}/${ant.project.name}/">
+ <include name="hcatalog-*.jar"/>
+ </fileset>
<fileset dir="hive/external/build/ivy/lib/default">
<include name="jdo2-api-*.jar"/>
Modified: incubator/hcatalog/trunk/conf/proto-hive-site.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/conf/proto-hive-site.xml?rev=1134097&r1=1134096&r2=1134097&view=diff
==============================================================================
--- incubator/hcatalog/trunk/conf/proto-hive-site.xml (original)
+++ incubator/hcatalog/trunk/conf/proto-hive-site.xml Thu Jun 9 21:43:35 2011
@@ -81,7 +81,7 @@
<property>
<name>hive.metastore.uris</name>
- <value>thrift://SVRHOST:3306</value>
+ <value>thrift://SVRHOST:9080</value>
<description>URI for client to contact metastore server</description>
</property>
Modified: incubator/hcatalog/trunk/scripts/hcat_server_install.sh
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/scripts/hcat_server_install.sh?rev=1134097&r1=1134096&r2=1134097&view=diff
==============================================================================
--- incubator/hcatalog/trunk/scripts/hcat_server_install.sh (original)
+++ incubator/hcatalog/trunk/scripts/hcat_server_install.sh Thu Jun 9 21:43:35 2011
@@ -20,11 +20,12 @@
# HCatalog distribution tarball
function usage() {
- echo "Usage: $0 -r root -d dbroot -h hadoop_home"
+ echo "Usage: $0 -r root -d dbroot -h hadoop_home -p server_port"
echo " root is the directory where you like to install the HCatalog server"
echo " /usr/local/hcat is suggested."
echo " dbroot is the directory where your mysql connector jar is located."
echo " hadoop_home is the directory of your Hadoop installation."
+ echo " server_port is the listening port of the HCatalog server"
echo " All paths must be absolute"
}
@@ -38,6 +39,7 @@ fi
root="unknown"
dbroot="unknown"
hadoop_home="unknown"
+server_port="9080"
while [ "${1}x" != "x" ] ; do
if [ $1 == "-r" ] || [ $1 == "--root" ] ; then
@@ -52,6 +54,10 @@ while [ "${1}x" != "x" ] ; do
shift
hadoop_home=$1
shift
+ elif [ $1 == "-p" ] || [ $1 == "--port" ] ; then
+ shift
+ server_port=$1
+ shift
else
echo "Unknown option $1"
shift
@@ -130,6 +136,7 @@ ROOT=$root
DBROOT=$dbroot
USER=`whoami`
HADOOP_HOME=$hadoop_home
+export METASTORE_PORT=$server_port
!!
echo "Installation successful"