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 ga...@apache.org on 2012/07/25 20:29:49 UTC
svn commit: r1365722 [1/11] - in /incubator/hcatalog/trunk: ./ ant/ conf/
hcatalog-pig-adapter/ ivy/ src/docs/src/documentation/content/xdocs/
src/docs/src/documentation/content/xdocs/images/
src/java/org/apache/hcatalog/mapreduce/ src/test/e2e/templet...
Author: gates
Date: Wed Jul 25 20:29:44 2012
New Revision: 1365722
URL: http://svn.apache.org/viewvc?rev=1365722&view=rev
Log:
HCATALOG-182 Web services interface for HCatalog access and Pig, Hive, and MR job execution
Added:
incubator/hcatalog/trunk/conf/templeton-default.xml
incubator/hcatalog/trunk/conf/templeton-log4j.properties
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/addproperty.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/configuration.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createcolumn.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createdb.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createpartition.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createtable.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createtablelike.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/ddl.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/ddlsummary.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/deletedb.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/deletepartition.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/deletetable.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/desccolumn.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/descdb.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/descpartition.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/descproperty.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/desctable.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/example.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/hive.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/TempletonArch.jpg (with props)
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/templetonlogo.png (with props)
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/templetonlogov2.png (with props)
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/images/templetontitle.jpg (with props)
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/listcolumns.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/listdbs.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/listpartitions.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/listproperties.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/listtables.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/mapreducejar.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/mapreducestreaming.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/pig.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/queue.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/queuedelete.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/queuelist.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/renametable.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/resources.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/responsetypes.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/rest.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/rest_server_install.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/status.xml
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/versions.xml
incubator/hcatalog/trunk/src/test/e2e/templeton/
incubator/hcatalog/trunk/src/test/e2e/templeton/README.txt
incubator/hcatalog/trunk/src/test/e2e/templeton/build.xml
incubator/hcatalog/trunk/src/test/e2e/templeton/conf/
incubator/hcatalog/trunk/src/test/e2e/templeton/conf/default.conf
incubator/hcatalog/trunk/src/test/e2e/templeton/deployAndTest.pl (with props)
incubator/hcatalog/trunk/src/test/e2e/templeton/drivers/
incubator/hcatalog/trunk/src/test/e2e/templeton/drivers/TestDriverCurl.pm
incubator/hcatalog/trunk/src/test/e2e/templeton/inpdir/
incubator/hcatalog/trunk/src/test/e2e/templeton/inpdir/jaradditionaljars.pig
incubator/hcatalog/trunk/src/test/e2e/templeton/inpdir/jarregistered.pig
incubator/hcatalog/trunk/src/test/e2e/templeton/inpdir/loadstore.pig
incubator/hcatalog/trunk/src/test/e2e/templeton/inpdir/nums.txt
incubator/hcatalog/trunk/src/test/e2e/templeton/inpdir/pythonudf.pig
incubator/hcatalog/trunk/src/test/e2e/templeton/inpdir/rowcount_withmacro.pig
incubator/hcatalog/trunk/src/test/e2e/templeton/inpdir/rowcountmacro.pig
incubator/hcatalog/trunk/src/test/e2e/templeton/inpdir/udfs.py
incubator/hcatalog/trunk/src/test/e2e/templeton/newtests/
incubator/hcatalog/trunk/src/test/e2e/templeton/newtests/jaradditionaljars.pig
incubator/hcatalog/trunk/src/test/e2e/templeton/newtests/jarregistered.pig
incubator/hcatalog/trunk/src/test/e2e/templeton/newtests/loadstore.pig
incubator/hcatalog/trunk/src/test/e2e/templeton/newtests/pigtest.txt
incubator/hcatalog/trunk/src/test/e2e/templeton/newtests/pythonudf.pig
incubator/hcatalog/trunk/src/test/e2e/templeton/newtests/rowcount_withmacro.pig
incubator/hcatalog/trunk/src/test/e2e/templeton/newtests/rowcountmacro.pig
incubator/hcatalog/trunk/src/test/e2e/templeton/newtests/udfs.py
incubator/hcatalog/trunk/src/test/e2e/templeton/tests/
incubator/hcatalog/trunk/src/test/e2e/templeton/tests/ddl.conf
incubator/hcatalog/trunk/src/test/e2e/templeton/tests/hcatperms.conf
incubator/hcatalog/trunk/src/test/e2e/templeton/tests/jobsubmission.conf
incubator/hcatalog/trunk/src/test/e2e/templeton/tests/serverstatus.conf
incubator/hcatalog/trunk/webhcat/
incubator/hcatalog/trunk/webhcat/svr/
incubator/hcatalog/trunk/webhcat/svr/build.xml
incubator/hcatalog/trunk/webhcat/svr/ivy.xml
incubator/hcatalog/trunk/webhcat/svr/src/
incubator/hcatalog/trunk/webhcat/svr/src/main/
incubator/hcatalog/trunk/webhcat/svr/src/main/bin/
incubator/hcatalog/trunk/webhcat/svr/src/main/bin/templeton_config.sh
incubator/hcatalog/trunk/webhcat/svr/src/main/bin/templeton_server.sh (with props)
incubator/hcatalog/trunk/webhcat/svr/src/main/java/
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hadoop/
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hadoop/mapred/
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hadoop/mapred/TempletonJobTracker.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/AppConfig.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/BadParam.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/BusyException.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CallbackFailedException.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CatchallExceptionMapper.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ColumnDesc.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CompleteBean.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/CompleteDelegator.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/DatabaseDesc.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/DeleteDelegator.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/EnqueueBean.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecBean.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecService.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ExecServiceImpl.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/GroupPermissionsDesc.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HcatDelegator.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HcatException.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/HiveDelegator.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/JarDelegator.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/JsonBuilder.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/LauncherDelegator.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/ListDelegator.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/Main.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/MaxByteArrayOutputStream.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/NotAuthorizedException.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/PartitionDesc.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/PigDelegator.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/QueueException.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/QueueStatusBean.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SecureProxySupport.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/Server.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SimpleExceptionMapper.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/SimpleWebException.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StatusDelegator.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/StreamingDelegator.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TableDesc.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TableLikeDesc.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TablePropertyDesc.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/TempletonDelegator.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/UgiFactory.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/WadlConfig.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/HDFSCleanup.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/HDFSStorage.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/JobState.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/JobStateTracker.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NotFoundException.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NullRecordReader.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/NullSplit.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/SingleInputFormat.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonControllerJob.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonStorage.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TempletonUtils.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/TrivialExecService.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/ZooKeeperCleanup.java
incubator/hcatalog/trunk/webhcat/svr/src/main/java/org/apache/hcatalog/templeton/tool/ZooKeeperStorage.java
incubator/hcatalog/trunk/webhcat/svr/src/test/
incubator/hcatalog/trunk/webhcat/svr/src/test/java/
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/TestDesc.java
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/TestServer.java
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockExecService.java
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockServer.java
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/mock/MockUriInfo.java
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTempletonUtils.java
incubator/hcatalog/trunk/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTrivialExecService.java
Modified:
incubator/hcatalog/trunk/CHANGES.txt
incubator/hcatalog/trunk/ant/findbugs.xml
incubator/hcatalog/trunk/build-common-new.xml
incubator/hcatalog/trunk/build-common.xml
incubator/hcatalog/trunk/build.xml
incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml
incubator/hcatalog/trunk/hcatalog-pig-adapter/ivy.xml
incubator/hcatalog/trunk/ivy.xml
incubator/hcatalog/trunk/ivy/libraries.properties
incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/site.xml
incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/MultiOutputFormat.java
incubator/hcatalog/trunk/storage-handlers/hbase/ivy.xml
Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1365722&r1=1365721&r2=1365722&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Wed Jul 25 20:29:44 2012
@@ -23,6 +23,8 @@ Trunk (unreleased changes)
INCOMPATIBLE CHANGES
NEW FEATURES
+ HCAT-182 Web services interface for HCatalog access and Pig, Hive, and MR job execution (ctdean, Rachel Gollub, and thejas via gates)
+
HCAT-328 HCatLoader should report its input size so pig can estimate the number of reducers (traviscrawford via gates)
IMPROVEMENTS
Modified: incubator/hcatalog/trunk/ant/findbugs.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/ant/findbugs.xml?rev=1365722&r1=1365721&r2=1365722&view=diff
==============================================================================
--- incubator/hcatalog/trunk/ant/findbugs.xml (original)
+++ incubator/hcatalog/trunk/ant/findbugs.xml Wed Jul 25 20:29:44 2012
@@ -45,6 +45,7 @@
<sourcePath path="@{sourceDir}"/>
<fileset dir="@{jarDir}">
<include name="**/hcatalog-*.jar"/>
+ <include name="**/webhcat-*.jar"/>
</fileset>
</findbugs>
<xslt style="${findbugs.home}/src/xsl/default.xsl"
Modified: incubator/hcatalog/trunk/build-common-new.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build-common-new.xml?rev=1365722&r1=1365721&r2=1365722&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build-common-new.xml (original)
+++ incubator/hcatalog/trunk/build-common-new.xml Wed Jul 25 20:29:44 2012
@@ -18,7 +18,7 @@
-->
<project name="build-common-new" default="jar" xmlns:ivy="antlib:org.apache.ivy.ant">
- <loadproperties srcfile="${basedir}/../ivy/libraries.properties"/>
+ <loadproperties srcfile="${path.to.basedir}/ivy/libraries.properties"/>
<property name="hcatalog.version" value="0.5.0-dev"/>
<property name="jar.name" value="${ant.project.name}-${hcatalog.version}.jar"/>
@@ -86,7 +86,7 @@
<target name="ivy-init">
<echo message="${ant.project.name}"/>
- <ivy:configure file="../ivy/ivysettings.xml"/>
+ <ivy:configure file="${path.to.basedir}/ivy/ivysettings.xml"/>
</target>
<target name="ivy-retrieve" depends="ivy-init">
@@ -139,5 +139,5 @@
classPathRef="findbugs.class.path"/>
</target>
- <import file="${basedir}/../ant/findbugs.xml"/>
+ <import file="${path.to.basedir}/ant/findbugs.xml"/>
</project>
Modified: incubator/hcatalog/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build-common.xml?rev=1365722&r1=1365721&r2=1365722&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build-common.xml (original)
+++ incubator/hcatalog/trunk/build-common.xml Wed Jul 25 20:29:44 2012
@@ -33,14 +33,19 @@
<fileset dir="${common.ivy.lib.dir}">
<include name="**/*.jar" />
</fileset>
- <!--
- <fileset dir="${hive.root}/build/ivy/lib/default" includes="antlr-3.0.1.jar"/>
- <fileset dir="${hive.root}/build/ivy/lib/default" includes="commons-lang-*.jar"/>
- <fileset dir="${hive.root}/build/ivy/lib/default" includes="datanucleus-enhancer-*.jar"/>
- <fileset dir="${hive.root}/build/ivy/lib/default" includes="datanucleus-core-*.jar"/>
- <fileset dir="${hive.root}/build/ivy/lib/default" includes="jdo2-api-*.jar"/>
- <fileset dir="${hive.root}/build/ivy/lib/default" includes="libfb303-*.jar"/>
- <fileset dir="${hive.root}/lib" includes="asm-3.1.jar"/>
- -->
</path>
+
+ <!-- Classpath that includes all sub packages, used for things like Java docs -->
+ <path id="uber.classpath">
+ <fileset dir="${common.ivy.lib.dir}">
+ <include name="**/*.jar" />
+ </fileset>
+ <fileset dir="webhcat/svr/build/ivy/default">
+ <include name="**/*.jar" />
+ </fileset>
+ <fileset dir="webhcat/svr/build/ivy/common">
+ <include name="**/*.jar" />
+ </fileset>
+ </path>
+
</project>
Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1365722&r1=1365721&r2=1365722&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Wed Jul 25 20:29:44 2012
@@ -250,6 +250,17 @@
<ivy:cachepath pathid="releaseaudit.classpath" conf="releaseaudit"/>
</target>
+ <target name="ivy-publish" depends="ivy-init">
+ <ivy:publish
+ resolver="local"
+ organisation="org.apache.hcatalog"
+ module="${ant.project.name}"
+ revision="${hcatalog.version}"
+ overwrite="true">
+ <artifacts pattern="${build.dir}/${ant.project.name}/[artifact]-[revision](-[classifier]).[ext]"/>
+ </ivy:publish>
+ </target>
+
<target name="ivy-report" depends="ivy-init" description="Generate Ivy dependency report">
<ivy:report todir="${build.ivy.report.dir}"
conf="common, default"
@@ -317,6 +328,7 @@
-->
<target name="jar" depends="clientjar,server-extensions,jar-storage-handlers">
<ant target="jar" dir="hcatalog-pig-adapter" inheritAll="false"/>
+ <ant target="jar" dir="webhcat/svr" inheritAll="false"/>
<jar jarfile="${build.dir}/${ant.project.name}/${hcatalog.jar}">
<zipfileset src="${build.dir}/${ant.project.name}/${hcatalog.core.jar}"/>
@@ -402,8 +414,14 @@
<fail if="tests.failed">Tests failed!</fail>
</sequential>
<ant target="test" dir="hcatalog-pig-adapter" inheritAll="false"/>
+ <ant target="test" dir="webhcat/svr" inheritAll="false"/>
<antcall target="test-storage-handlers"/>
</target>
+
+<!-- TMP REMOVE THIS -->
+ <target name="hack-test" depends="compile-test">
+ <ant target="test" dir="webhcat/svr" inheritAll="false"/>
+ </target>
<!--
================================================================================
@@ -421,6 +439,9 @@
<mkdir dir="${clover.db.dir}"/>
<clover-setup initString="${clover.db.dir}/hcat_coverage.db">
<fileset dir="src" includes="**/*.java" excludes="**/NoExitSecurityManager.java"/>
+ <fileset dir="webhcat/svr/src/main/java" includes="**/*.java"/>
+ <fileset dir="storage-handlers/hbase/src/java" includes="**/*.java"/>
+ <fileset dir="hcatalog-pig-adapter/src/main/java" includes="**/*.java"/>
</clover-setup>
</target>
@@ -487,6 +508,7 @@
classPathRef="findbugs.class.path"/>
<ant target="findbugs" dir="hcatalog-pig-adapter" inheritAll="false"/>
+ <ant target="findbugs" dir="webhcat/svr" inheritAll="false"/>
</target>
<!--
@@ -499,6 +521,7 @@
<delete dir="${build.dir}" />
<delete dir="${test.warehouse.dir}"/>
<ant target="clean" dir="hcatalog-pig-adapter" inheritAll="false"/>
+ <ant target="clean" dir="webhcat/svr" inheritAll="false"/>
<ant target="clean" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
</target>
@@ -508,7 +531,8 @@
================================================================================
-->
<target name="docs" depends="forrest, javadoc"
- description="Generate Javadoc and Forrest documentation" />
+ description="Generate Javadoc and Forrest documentation">
+ </target>
<target name="forrest" if="forrest.home"
description="Generate forrest-based documentation. To use, specify -Dforrest.home=<base of Apache Forrest installation> on the command line.">
@@ -533,9 +557,16 @@
doctitle="HCatalog ${hcatalog.version} API"
failonerror="true">
<packageset dir="${src.dir}" />
+ <packageset dir="hcatalog-pig-adapter/src/main/java" />
+ <packageset dir="webhcat/svr/src/main/java" />
+ <!--
<classpath>
<path refid="classpath" />
</classpath>
+ -->
+ <classpath>
+ <path refid="uber.classpath"/>
+ </classpath>
<group title="hcatalog" packages="org.apache.hcatalog.*" />
</javadoc>
</target>
@@ -578,6 +609,9 @@
<fileset dir="hcatalog-pig-adapter/build">
<include name="hcatalog-*.jar"/>
</fileset>
+ <fileset dir="webhcat/svr/build">
+ <include name="webhcat-*.jar"/>
+ </fileset>
</copy>
<copy todir="${dist.dir}/bin">
@@ -618,6 +652,9 @@
<fileset dir="${package.dir}">
<include name="*.sh"/>
</fileset>
+ <fileset dir="webhcat/svr/src/main/bin">
+ <include name="*.sh"/>
+ </fileset>
<fileset dir="bin">
<include name="hcat_server.sh"/>
</fileset>
@@ -657,7 +694,8 @@
<tar compression="gzip" longfile="gnu" destfile="${build.dir}/${ant.project.name}-src-${hcatalog.version}.tar.gz">
<tarfileset dir="${basedir}" mode="644" prefix="${ant.project.name}-src-${hcatalog.version}">
<include name="conf/**"/>
- <include name="hcatalog-pig-adapter"/>
+ <include name="hcatalog-pig-adapter/**"/>
+ <include name="webhcat/**"/>
<include name="ivy/**"/>
<exclude name="ivy/*.jar"/>
<include name="license/**"/>
Added: incubator/hcatalog/trunk/conf/templeton-default.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/conf/templeton-default.xml?rev=1365722&view=auto
==============================================================================
--- incubator/hcatalog/trunk/conf/templeton-default.xml (added)
+++ incubator/hcatalog/trunk/conf/templeton-default.xml Wed Jul 25 20:29:44 2012
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!-- The default settings for Templeton. -->
+<!-- Edit templeton-site.xml to change settings for your local -->
+<!-- install. -->
+
+<configuration>
+
+ <property>
+ <name>templeton.port</name>
+ <value>50111</value>
+ <description>The HTTP port for the main server.</description>
+ </property>
+
+ <property>
+ <name>templeton.hadoop.conf.dir</name>
+ <value>${env.HADOOP_CONF_DIR}</value>
+ <description>The path to the Hadoop configuration.</description>
+ </property>
+
+ <property>
+ <name>templeton.jar</name>
+ <value>${env.TEMPLETON_HOME}/templeton-0.1.0-dev.jar</value>
+ <description>The path to the Templeton jar file.</description>
+ </property>
+
+ <property>
+ <name>templeton.libjars</name>
+ <value>${env.TEMPLETON_HOME}/lib/zookeeper-3.3.4.jar</value>
+ <description>Jars to add to the classpath.</description>
+ </property>
+
+ <property>
+ <name>templeton.override.jars</name>
+ <value>hdfs:///user/templeton/ugi.jar</value>
+ <description>
+ Jars to add the the HADOOP_CLASSPATH for all Map Reduce jobs.
+ This is a list of jars that must exist on hdfs that are added
+ to the Distributed Cache.
+ </description>
+ </property>
+
+ <property>
+ <name>templeton.override.enabled</name>
+ <value>true</value>
+ <description>
+ Enable the override path in templeton.override.jars
+ </description>
+ </property>
+
+ <property>
+ <name>templeton.streaming.jar</name>
+ <value>hdfs:///user/templeton/hadoop-streaming.jar</value>
+ <description>The hdfs path to the Hadoop streaming jar file.</description>
+ </property>
+
+ <property>
+ <name>templeton.hadoop</name>
+ <value>${env.HADOOP_PREFIX}/bin/hadoop</value>
+ <description>The path to the Hadoop executable.</description>
+ </property>
+
+ <property>
+ <name>templeton.pig.archive</name>
+ <value>hdfs:///user/templeton/pig-0.9.2.tar.gz</value>
+ <description>The path to the Pig archive.</description>
+ </property>
+
+ <property>
+ <name>templeton.pig.path</name>
+ <value>pig-0.9.2.tar.gz/pig-0.9.2/bin/pig</value>
+ <description>The path to the Pig executable.</description>
+ </property>
+
+ <property>
+ <name>templeton.hcat</name>
+ <value>${env.HCAT_PREFIX}/bin/hcat</value>
+ <description>The path to the hcatalog executable.</description>
+ </property>
+
+ <property>
+ <name>templeton.hive.archive</name>
+ <value>hdfs:///user/templeton/hcatalog-0.3.0.tar.gz</value>
+ <description>The path to the Hive archive.</description>
+ </property>
+
+ <property>
+ <name>templeton.hive.path</name>
+ <value>hcatalog-0.3.0.tar.gz/hcatalog-0.3.0/bin/hive</value>
+ <description>The path to the Hive executable.</description>
+ </property>
+
+ <property>
+ <name>templeton.hive.properties</name>
+ <value>hive.metastore.local=false,hive.metastore.uris=thrift://localhost:9933,hive.metastore.sasl.enabled=false</value>
+ <description>Properties to set when running hive.</description>
+ </property>
+
+ <property>
+ <name>templeton.exec.encoding</name>
+ <value>UTF-8</value>
+ <description>The encoding of the stdout and stderr data.</description>
+ </property>
+
+ <property>
+ <name>templeton.exec.timeout</name>
+ <value>10000</value>
+ <description>
+ How long in milliseconds a program is allowed to run on the
+ Templeton box.
+ </description>
+ </property>
+
+ <property>
+ <name>templeton.exec.max-procs</name>
+ <value>16</value>
+ <description>The maximum number of processes allowed to run at once.</description>
+ </property>
+
+ <property>
+ <name>templeton.exec.max-output-bytes</name>
+ <value>1048576</value>
+ <description>
+ The maximum number of bytes from stdout or stderr stored in ram.
+ </description>
+ </property>
+
+ <property>
+ <name>templeton.exec.envs</name>
+ <value>HADOOP_PREFIX,HADOOP_HOME,JAVA_HOME</value>
+ <description>The environment variables passed through to exec.</description>
+ </property>
+
+ <property>
+ <name>templeton.zookeeper.hosts</name>
+ <value>127.0.0.1:2181</value>
+ <description>ZooKeeper servers, as comma separated host:port pairs</description>
+ </property>
+
+ <property>
+ <name>templeton.zookeeper.session-timeout</name>
+ <value>30000</value>
+ <description>ZooKeeper session timeout in milliseconds</description>
+ </property>
+
+ <property>
+ <name>templeton.callback.retry.interval</name>
+ <value>10000</value>
+ <description>How long to wait between callback retry attempts in milliseconds</description>
+ </property>
+
+ <property>
+ <name>templeton.callback.retry.attempts</name>
+ <value>5</value>
+ <description>How many times to retry the callback</description>
+ </property>
+
+ <property>
+ <name>templeton.storage.class</name>
+ <value>org.apache.hcatalog.templeton.tool.HDFSStorage</value>
+ <description>The class to use as storage</description>
+ </property>
+
+ <property>
+ <name>templeton.storage.root</name>
+ <value>/templeton-hadoop</value>
+ <description>The path to the directory to use for storage</description>
+ </property>
+
+ <property>
+ <name>templeton.hdfs.cleanup.interval</name>
+ <value>43200000</value>
+ <description>The maximum delay between a thread's cleanup checks</description>
+ </property>
+
+ <property>
+ <name>templeton.hdfs.cleanup.maxage</name>
+ <value>604800000</value>
+ <description>The maximum age of a templeton job</description>
+ </property>
+
+ <property>
+ <name>templeton.zookeeper.cleanup.interval</name>
+ <value>43200000</value>
+ <description>The maximum delay between a thread's cleanup checks</description>
+ </property>
+
+ <property>
+ <name>templeton.zookeeper.cleanup.maxage</name>
+ <value>604800000</value>
+ <description>The maximum age of a templeton job</description>
+ </property>
+
+</configuration>
Added: incubator/hcatalog/trunk/conf/templeton-log4j.properties
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/conf/templeton-log4j.properties?rev=1365722&view=auto
==============================================================================
--- incubator/hcatalog/trunk/conf/templeton-log4j.properties (added)
+++ incubator/hcatalog/trunk/conf/templeton-log4j.properties Wed Jul 25 20:29:44 2012
@@ -0,0 +1,31 @@
+#
+# templeton-log4j - configure the Templeton logging system
+
+# Define some default values that can be overridden by system properties
+templeton.root.logger = DEBUG, standard
+templeton.log.dir = .
+templeton.log.file = templeton.log
+
+log4j.rootLogger = ${templeton.root.logger}
+
+# Logging Threshold
+log4j.threshhold = DEBUG
+
+log4j.appender.standard = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.standard.File = ${templeton.log.dir}/${templeton.log.file}
+
+# Rollver at midnight
+log4j.appender.DRFA.DatePattern = .yyyy-MM-dd
+
+log4j.appender.DRFA.layout = org.apache.log4j.PatternLayout
+
+log4j.appender.standard.layout = org.apache.log4j.PatternLayout
+log4j.appender.standard.layout.conversionPattern = %-5p | %d{DATE} | %c | %m%n
+
+# Class logging settings
+log4j.logger.com.sun.jersey = DEBUG
+log4j.logger.com.sun.jersey.spi.container.servlet.WebComponent = ERROR
+log4j.logger.org.apache.hadoop = INFO
+log4j.logger.org.apache.hadoop.conf = WARN
+log4j.logger.org.apache.zookeeper = WARN
+log4j.logger.org.eclipse.jetty = INFO
Modified: incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml?rev=1365722&r1=1365721&r2=1365722&view=diff
==============================================================================
--- incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml (original)
+++ incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml Wed Jul 25 20:29:44 2012
@@ -18,6 +18,7 @@
-->
<project name="hcatalog-pig-adapter">
+ <property name="path.to.basedir" value="${basedir}/.."/>
<import file="../build-common-new.xml"/>
<property name="clover.jar" location="${clover.home}/lib/clover.jar"/>
Modified: incubator/hcatalog/trunk/hcatalog-pig-adapter/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/hcatalog-pig-adapter/ivy.xml?rev=1365722&r1=1365721&r2=1365722&view=diff
==============================================================================
--- incubator/hcatalog/trunk/hcatalog-pig-adapter/ivy.xml (original)
+++ incubator/hcatalog/trunk/hcatalog-pig-adapter/ivy.xml Wed Jul 25 20:29:44 2012
@@ -30,7 +30,7 @@
</configurations>
<dependencies>
- <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}"/>
+ <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop.jars.version}"/>
<dependency org="org.apache.hive" name="hive-metastore" rev="${hive.version}"/>
<dependency org="org.apache.hive" name="hive-exec" rev="${hive.version}"/>
<dependency org="org.apache.hive" name="hive-builtins" rev="${hive.version}"/>
Modified: incubator/hcatalog/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/ivy.xml?rev=1365722&r1=1365721&r2=1365722&view=diff
==============================================================================
--- incubator/hcatalog/trunk/ivy.xml (original)
+++ incubator/hcatalog/trunk/ivy.xml Wed Jul 25 20:29:44 2012
@@ -56,16 +56,16 @@
<dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"
conf="common->master"/>
<dependency org="org.apache.hadoop" name="hadoop-tools"
- rev="${hadoop-tools.version}" conf="common->master" />
+ rev="${hadoop.jars.version}" conf="common->master" />
<dependency org="org.apache.hadoop" name="hadoop-core"
- rev="${hadoop-core.version}" conf="common->master" />
+ rev="${hadoop.jars.version}" conf="default" />
<dependency org="org.apache.hadoop" name="hadoop-test"
- rev="${hadoop-test.version}" conf="common->master" />
+ rev="${hadoop.jars.version}" conf="common->master" />
<dependency org="javax.jms" name="jms" rev="${jms.version}"
conf="common->master" />
<dependency org="org.apache.activemq" name="activemq-core"
rev="${activemq.version}" conf="common->master" />
- <dependency org="org.apache.activemq" name="kahadb"
+ <dependency org="org.apache.activemq" name="kahadb"
rev="${activemq.version}" conf="common->master" />
<dependency org="javax.management.j2ee" name="management-api"
rev="${javax-mgmt.version}" conf="common->master" />
@@ -78,7 +78,7 @@
<dependency org="org.codehaus.jackson" name="jackson-core-asl"
rev="${jackson.version}" conf="common->master"/>
<dependency org="org.apache.hive" name="hive-metastore"
- rev="${hive.version}" conf="common->master"/>
+ rev="${hive.version}" conf="default"/>
<dependency org="org.apache.hive" name="hive-common"
rev="${hive.version}" conf="common->master"/>
<dependency org="org.apache.hive" name="hive-exec"
@@ -128,10 +128,6 @@
</dependency>
<dependency org="org.apache.hive" name="hive-builtins"
rev="${hive.version}" conf="common->master"/>
- <dependency org="org.mortbay.jetty" name="jetty"
- rev="${jetty.version}" conf="default"/>
- <dependency org="org.mortbay.jetty" name="jetty-util"
- rev="${jetty.version}" conf="default"/>
<dependency org="org.apache.commons" name="commons-compress" rev="${commons-compress.version}" conf="default"/>
</dependencies>
</ivy-module>
Modified: incubator/hcatalog/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/ivy/libraries.properties?rev=1365722&r1=1365721&r2=1365722&view=diff
==============================================================================
--- incubator/hcatalog/trunk/ivy/libraries.properties (original)
+++ incubator/hcatalog/trunk/ivy/libraries.properties Wed Jul 25 20:29:44 2012
@@ -13,14 +13,19 @@
#This properties file lists the versions of the various artifacts used by hadoop and components.
#It drives ivy and the generation of a maven POM
+activation.version=1.1
activemq.version=5.5.0
antlr.version=3.0.1
+asm-all.version=3.2
commons-cli.version=1.2
+commons-codec.version=1.4
commons-configuration.version=1.6
commons-compress.version=1.4.1
commons-dbcp.version=1.4
+commons-exec.version=1.1
commons-httpclient.version=3.0.1
commons-lang.version=2.4
+commons-logging.version=1.1.1
commons-pool.version=1.5.4
datanucleus-connectionpool.version=2.0.3
datanucleus-core.version=2.0.3
@@ -29,23 +34,31 @@ datanucleus-rdbms.version=2.0.3
derby.version=10.4.2.0
fb303.version=0.7.0
guava.version=11.0
-hadoop-core.version=1.0.2
-hadoop-test.version=1.0.2
-hadoop-tools.version=1.0.2
+hadoop.jars.version=1.0.3
hbase.version=0.92.0
high-scale-lib.version=1.1.1
hive.version=0.10.0-SNAPSHOT
ivy.version=2.1.0
jackson.version=1.7.3
javax-mgmt.version=1.1-rev-1
+jaxb-api.version=2.2.2
+jaxb-impl.version=2.2.3-1
jdeb.version=0.8
jdo.version=2.3-ec
+jersey.version=1.9.1
+jettison.version=1.1
jetty.version=6.1.26
+jetty.webhcat.version=7.6.0.v20120127
jms.version=1.1
junit.version=4.10
log4j.version=1.2.16
+oro.version=2.0.8
pig.version=0.8.0
rats-lib.version=0.5.1
+servlet-api.version=2.5
slf4j.version=1.6.1
+stax-api.version=1.0-2
+wadl-resourcedoc-doclet.version=1.4
+xerces.version=2.9.1
zookeeper.version=3.4.3
Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/addproperty.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/addproperty.xml?rev=1365722&view=auto
==============================================================================
--- incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/addproperty.xml (added)
+++ incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/addproperty.xml Wed Jul 25 20:29:44 2012
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document>
+ <header>
+ <title>PUT ddl/database/:db/table/:table/property/:property</title>
+ </header>
+
+ <body>
+ <section>
+ <title>Description</title>
+ <p>Add a single property on an HCatalog table.
+ This will also reset an existing property.</p>
+ </section>
+
+ <section>
+ <title>URL</title>
+ <p><code>http://</code>www.myserver.com<code>/templeton/v1/ddl/database/</code>:db<code>/table/</code>:table<code>/property/</code>:property</p>
+ </section>
+
+ <section>
+ <title>Parameters</title>
+ <table>
+ <tr><th>Name</th><th>Description</th><th>Required?</th><th>Default</th></tr>
+
+ <tr><td><strong>:db</strong></td>
+ <td>The database name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>:table</strong></td>
+ <td>The table name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>:property</strong></td>
+ <td>The property name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>group</strong></td>
+ <td>The user group to use</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>permissions</strong></td>
+ <td>The permissions string to use</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>value</strong></td>
+ <td>The property value</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+ </table>
+ </section>
+
+ <section>
+ <title>Results</title>
+ <table>
+ <tr><th>Name</th><th>Description</th></tr>
+
+ <tr><td><strong>database</strong></td>
+ <td>The database name</td>
+ </tr>
+
+ <tr><td><strong>table</strong></td>
+ <td>The table name</td>
+ </tr>
+
+ <tr><td><strong>property</strong></td>
+ <td>The property name</td>
+ </tr>
+
+ </table>
+ </section>
+
+ <section>
+ <title>Example</title>
+
+ <p><strong>Curl Command</strong></p>
+<source>
+% curl -s -X PUT -HContent-type:application/json -d '{ "value": "apples" }' \
+ 'http://localhost:50111/templeton/v1/ddl/database/default/table/test_table/property/fruit?user.name=ctdean'
+</source>
+
+ <p><strong>JSON Output</strong></p>
+<source>
+{
+ "property": "fruit",
+ "table": "test_table",
+ "database": "default"
+}
+</source>
+ </section>
+ </body>
+</document>
Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/configuration.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/configuration.xml?rev=1365722&view=auto
==============================================================================
--- incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/configuration.xml (added)
+++ incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/configuration.xml Wed Jul 25 20:29:44 2012
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document>
+ <header>
+ <title>Configuration</title>
+ </header>
+ <body>
+ <p>The configuration for Templeton merges the normal Hadoop configuration with
+ the Templeton specific variables. Because Templeton is designed to connect services
+ that are not normally connected, the configuration is more complex than might be
+ desirable.</p>
+
+ <p>The Templeton specific configuration is split into two layers:</p>
+
+ <ol>
+ <li><strong>templeton-default.xml</strong> - All the configuration variables
+ that Templeton needs. This file sets the defaults that ship with Templeton and
+ should only be changed by Templeton developers. Do not copy this file and/or
+ change it to maintain local installation settings. Because templeton-default.xml
+ is present in the Templeton war file, editing a local copy of it will not change the
+ configuration.</li>
+
+ <li><strong>templeton-site.xml</strong> - The (possibly empty) configuration
+ file in which the system administrator can set variables for their Hadoop cluster.
+ Create this file and maintain entries in it for configuration variables
+ that require you to override default values based on your local installation.</li>
+ </ol>
+
+ <p>The configuration files are loaded in this order with later files overriding
+ earlier ones.</p>
+
+ <p><strong>Note:</strong> the Templeton server will require restart
+ after any change to the configuration.</p>
+
+ <p>To find the configuration files, Templeton first attempts to load a file from the
+ <code>CLASSPATH</code> and then looks in the directory specified in the
+ <code>TEMPLETON_HOME</code> environment variable.</p>
+
+ <p>Configuration files may access the special environment variable
+ <code>env</code> for all environment variables. For example, the pig executable
+ could be specified using:</p>
+
+<source>
+${env.PIG_HOME}/bin/pig
+</source>
+
+ <p>Configuration variables that use a filesystem path try to have reasonable defaults.
+ However, it's always safe to specify the full and complete path if there is any
+ uncertainty.</p>
+
+ <p><strong>Note:</strong> The location of the log files created by Templeton and some other properties
+ of the logging system are set in the templeton-log4j.properties file.</p>
+
+ <section>
+ <title>Variables</title>
+ <table>
+ <tr><th>Name</th><th>Default</th><th>Description</th></tr>
+
+ <tr>
+ <td><strong>templeton.port</strong></td>
+ <td><code>50111</code></td>
+ <td>The HTTP port for the main server.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.hadoop.config.dir</strong></td>
+ <td><code>$(env.HADOOP_CONFIG_DIR)</code></td>
+ <td>The path to the Hadoop configuration.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.jar</strong></td>
+ <td><code>${env.TEMPLETON_HOME}/templeton/templeton-0.1.0-dev.jar</code></td>
+ <td>The path to the Templeton jar file.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.libjars</strong></td>
+ <td><code>${env.TEMPLETON_HOME}/lib/zookeeper-3.3.4.jar</code></td>
+ <td>Jars to add to the classpath.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.override.jars</strong></td>
+ <td><code>hdfs:///user/templeton/ugi.jar</code></td>
+ <td>Jars to add to the HADOOP_CLASSPATH for all Map Reduce jobs.
+ These jars must exist on HDFS.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.override.enabled</strong></td>
+ <td><code>true</code></td>
+ <td>Enable the override path in templeton.override.jars</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.streaming.jar</strong></td>
+ <td><code>hdfs:///user/templeton/hadoop-streaming.jar</code></td>
+ <td>The hdfs path to the Hadoop streaming jar file.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.hadoop</strong></td>
+ <td><code>${env.HADOOP_PREFIX}/bin/hadoop</code></td>
+ <td>The path to the Hadoop executable.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.pig.archive</strong></td>
+ <td><code>hdfs:///user/templeton/pig-0.9.2.tar.gz</code></td>
+ <td>The path to the Pig archive.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.pig.path</strong></td>
+ <td><code>pig-0.9.2.tar.gz/pig-0.9.2/bin/pig</code></td>
+ <td>The path to the Pig executable.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.hcat</strong></td>
+ <td><code>${env.HCAT_PREFIX}/bin/hcat</code></td>
+ <td>The path to the Hcatalog executable.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.hive.archive</strong></td>
+ <td><code>hdfs:///user/templeton/hcatalog-0.3.0.tar.gz</code></td>
+ <td>The path to the Hive archive.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.hive.path</strong></td>
+ <td><code>hcatalog-0.3.0.tar.gz/hcatalog-0.3.0/bin/hive</code></td>
+ <td>The path to the Hive executable.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.hive.properties</strong></td>
+ <td>
+<code>hive.metastore.local=false,
+hive.metastore.uris=thrift://localhost:9933,
+hive.metastore.sasl.enabled=false</code></td>
+ <td>Properties to set when running hive.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.exec.encoding</strong></td>
+ <td><code>UTF-8</code></td>
+ <td>The encoding of the stdout and stderr data.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.exec.timeout</strong></td>
+ <td><code>10000</code></td>
+ <td>How long in milliseconds a program is allowed to run on the
+ Templeton box.
+ </td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.exec.max-procs</strong></td>
+ <td><code>16</code></td>
+ <td>The maximum number of processes allowed to run at once.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.exec.max-output-bytes</strong></td>
+ <td><code>1048576</code></td>
+ <td>The maximum number of bytes from stdout or stderr stored in ram.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.exec.envs</strong></td>
+ <td><code>HADOOP_PREFIX,HADOOP_HOME,JAVA_HOME</code></td>
+ <td>The environment variables passed through to exec.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.zookeeper.hosts</strong></td>
+ <td><code>127.0.0.1:2181</code></td>
+ <td>ZooKeeper servers, as comma separated host:port pairs</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.zookeeper.session-timeout</strong></td>
+ <td><code>30000</code></td>
+ <td>ZooKeeper session timeout in milliseconds</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.callback.retry.interval</strong></td>
+ <td><code>10000</code></td>
+ <td>How long to wait between callback retry attempts in milliseconds</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.callback.retry.attempts</strong></td>
+ <td><code>5</code></td>
+ <td>How many times to retry the callback</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.storage.class</strong></td>
+ <td><code>org.apache.hcatalog.templeton.tool.ZooKeeperStorage</code></td>
+ <td>The class to use as storage</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.storage.root</strong></td>
+ <td><code>/templeton-hadoop</code></td>
+ <td>The path to the directory to use for storage</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.hdfs.cleanup.interval</strong></td>
+ <td><code>43200000</code></td>
+ <td>The maximum delay between a thread's cleanup checks</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.hdfs.cleanup.maxage</strong></td>
+ <td><code>604800000</code></td>
+ <td>The maximum age of a templeton job</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.zookeeper.cleanup.interval</strong></td>
+ <td><code>43200000</code></td>
+ <td>The maximum delay between a thread's cleanup checks</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.zookeeper.cleanup.maxage</strong></td>
+ <td><code>604800000</code></td>
+ <td>The maximum age of a templeton job</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.kerberos.secret</strong></td>
+ <td>A random value</td>
+ <td>The secret used to sign the HTTP cookie value. The default
+ value is a random value. Unless multiple Templeton instances
+ need to share the secret the random value is adequate.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.kerberos.principal</strong></td>
+ <td>None</td>
+ <td>The Kerberos principal to used by the server. As stated by the
+ Kerberos SPNEGO specification, it should be
+ <code>USER/${HOSTNAME}@{REALM}</code>. It does not have a
+ default value.</td>
+ </tr>
+
+ <tr>
+ <td><strong>templeton.kerberos.keytab</strong></td>
+ <td>None</td>
+ <td>The keytab file containing the credentials for the Kerberos
+ principal.</td>
+ </tr>
+
+ </table>
+ </section>
+
+ </body>
+</document>
Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createcolumn.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createcolumn.xml?rev=1365722&view=auto
==============================================================================
--- incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createcolumn.xml (added)
+++ incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createcolumn.xml Wed Jul 25 20:29:44 2012
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document>
+ <header>
+ <title>PUT ddl/database/:db/table/:table/column/:column</title>
+ </header>
+
+ <body>
+ <section>
+ <title>Description</title>
+ <p>Create a column in an HCatalog table.</p>
+ </section>
+
+ <section>
+ <title>URL</title>
+ <p><code>http://</code>www.myserver.com<code>/templeton/v1/ddl/database/</code>:db<code>/table/</code>:table<code>/column/</code>:column</p>
+ </section>
+
+ <section>
+ <title>Parameters</title>
+ <table>
+ <tr><th>Name</th><th>Description</th><th>Required?</th><th>Default</th></tr>
+
+ <tr><td><strong>:db</strong></td>
+ <td>The database name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>:table</strong></td>
+ <td>The table name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>:column</strong></td>
+ <td>The column name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>group</strong></td>
+ <td>The user group to use</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>permissions</strong></td>
+ <td>The permissions string to use</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>type</strong></td>
+ <td>The type of column to add, like "string" or "int"</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>comment</strong></td>
+ <td>The column comment, like a description</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ </table>
+ </section>
+
+ <section>
+ <title>Results</title>
+ <table>
+ <tr><th>Name</th><th>Description</th></tr>
+
+ <tr><td><strong>column</strong></td>
+ <td>The column name</td>
+ </tr>
+
+ <tr><td><strong>table</strong></td>
+ <td>The table name</td>
+ </tr>
+
+ <tr><td><strong>database</strong></td>
+ <td>The database name</td>
+ </tr>
+
+ </table>
+ </section>
+
+ <section>
+ <title>Example</title>
+
+ <p><strong>Curl Command</strong></p>
+<source>
+% curl -s -X PUT -HContent-type:application/json \
+ -d '{"type": "string", "comment": "The brand name"}' \
+ 'http://localhost:50111/templeton/v1/ddl/database/default/table/test_table/column/brand?user.name=ctdean'
+</source>
+
+ <p><strong>JSON Output</strong></p>
+<source>
+{
+ "column": "brand",
+ "table": "test_table",
+ "database": "default"
+}
+</source>
+ </section>
+ </body>
+</document>
Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createdb.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createdb.xml?rev=1365722&view=auto
==============================================================================
--- incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createdb.xml (added)
+++ incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createdb.xml Wed Jul 25 20:29:44 2012
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document>
+ <header>
+ <title>PUT ddl/database/:db</title>
+ </header>
+
+ <body>
+ <section>
+ <title>Description</title>
+ <p>Create a database.</p>
+ </section>
+
+ <section>
+ <title>URL</title>
+ <p><code>http://</code>www.myserver.com<code>/templeton/v1/ddl/database/</code>:db</p>
+ </section>
+
+ <section>
+ <title>Parameters</title>
+ <table>
+ <tr><th>Name</th><th>Description</th><th>Required?</th><th>Default</th></tr>
+
+ <tr><td><strong>:db</strong></td>
+ <td>The database name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>group</strong></td>
+ <td>The user group to use</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>permissions</strong></td>
+ <td>The permissions string to use</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>location</strong></td>
+ <td>The database location</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>comment</strong></td>
+ <td>A comment for the database, like a description</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>properties</strong></td>
+ <td>The database properties</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ </table>
+ </section>
+
+ <section>
+ <title>Results</title>
+ <table>
+ <tr><th>Name</th><th>Description</th></tr>
+
+ <tr><td><strong>database</strong></td>
+ <td>The database name</td>
+ </tr>
+
+ </table>
+ </section>
+
+ <section>
+ <title>Example</title>
+
+ <p><strong>Curl Command</strong></p>
+<source>
+% curl -s -X PUT -HContent-type:application/json \
+ -d '{ "comment":"Hello there",
+ "location":"hdfs://localhost:9000/user/hive/my_warehouse",
+ "properties":{"a":"b"}}' \
+ 'http://localhost:50111/templeton/v1/ddl/database/newdb?user.name=rachel'
+</source>
+
+ <p><strong>JSON Output</strong></p>
+<source>
+{
+ "database":"newdb"
+}
+</source>
+ </section>
+ </body>
+</document>
Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createpartition.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createpartition.xml?rev=1365722&view=auto
==============================================================================
--- incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createpartition.xml (added)
+++ incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createpartition.xml Wed Jul 25 20:29:44 2012
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document>
+ <header>
+ <title>PUT ddl/database/:db/table/:table/partition/:partition</title>
+ </header>
+
+ <body>
+ <section>
+ <title>Description</title>
+ <p>Create a partition in an HCatalog table.</p>
+ </section>
+
+ <section>
+ <title>URL</title>
+ <p><code>http://</code>www.myserver.com<code>/templeton/v1/ddl/database/</code>:db<code>/table/</code>:table<code>/partition/</code>:partition</p>
+ </section>
+
+ <section>
+ <title>Parameters</title>
+ <table>
+ <tr><th>Name</th><th>Description</th><th>Required?</th><th>Default</th></tr>
+
+ <tr><td><strong>:db</strong></td>
+ <td>The database name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>:table</strong></td>
+ <td>The table name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>:partition</strong></td>
+ <td>The partition name, col_name='value' list. Be careful to properly
+ encode the quote for http, for example, country=%27algeria%27.</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>group</strong></td>
+ <td>The user group to use</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>permissions</strong></td>
+ <td>The permissions string to use</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>location</strong></td>
+ <td>The location for partition creation</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>ifNotExists</strong></td>
+ <td>If true, return an error if the partition already exists.</td>
+ <td>Optional</td>
+ <td>False</td>
+ </tr>
+
+ </table>
+ </section>
+
+ <section>
+ <title>Results</title>
+ <table>
+ <tr><th>Name</th><th>Description</th></tr>
+
+ <tr><td><strong>partition</strong></td>
+ <td>The partition name</td>
+ </tr>
+
+ <tr><td><strong>table</strong></td>
+ <td>The table name</td>
+ </tr>
+
+ <tr><td><strong>database</strong></td>
+ <td>The database name</td>
+ </tr>
+
+ </table>
+ </section>
+
+ <section>
+ <title>Example</title>
+
+ <p><strong>Curl Command</strong></p>
+<source>
+% curl -s -X PUT -HContent-type:application/json -d '{"location": "loc_a"}' \
+ 'http://localhost:50111/templeton/v1/ddl/database/default/table/test_table/partition/country=%27algeria%27?user.name=ctdean'
+</source>
+
+ <p><strong>JSON Output</strong></p>
+<source>
+{
+ "partition": "country='algeria'",
+ "table": "test_table",
+ "database": "default"
+}
+</source>
+ </section>
+ </body>
+</document>
Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createtable.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createtable.xml?rev=1365722&view=auto
==============================================================================
--- incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createtable.xml (added)
+++ incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createtable.xml Wed Jul 25 20:29:44 2012
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document>
+ <header>
+ <title>PUT ddl/database/:db/table/:table</title>
+ </header>
+
+ <body>
+ <section>
+ <title>Description</title>
+ <p>Create a new HCatalog table. For more information, please refer to the
+ <a href="https://cwiki.apache.org/Hive/languagemanual-ddl.html#LanguageManualDDL-CreateTable">Hive documentation.</a></p>
+ </section>
+
+ <section>
+ <title>URL</title>
+ <p><code>http://</code>www.myserver.com<code>/templeton/v1/ddl/database/</code>:db<code>/table/</code>:table</p>
+ </section>
+
+ <section>
+ <title>Parameters</title>
+ <table>
+ <tr><th>Name</th><th>Description</th><th>Required?</th><th>Default</th></tr>
+
+ <tr><td><strong>:db</strong></td>
+ <td>The database name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>:table</strong></td>
+ <td>The new table name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>group</strong></td>
+ <td>The user group to use when creating a table</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>permissions</strong></td>
+ <td>The permissions string to use when creating a table.</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>external</strong></td>
+ <td>Allows you to specify a location so that Hive does not use the default
+ location for this table.</td>
+ <td>Optional</td>
+ <td>false</td>
+ </tr>
+
+ <tr><td><strong>ifNotExists</strong></td>
+ <td>If true, you will not receive an error if the table already exists.</td>
+ <td>Optional</td>
+ <td>false</td>
+ </tr>
+
+ <tr><td><strong>comment</strong></td>
+ <td>Comment for the table</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>columns</strong></td>
+ <td>A list of column descriptions, including name, type, and an optional comment.</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>partitionedBy</strong></td>
+ <td>A list of column descriptions used to partition the table. Like the columns
+ parameter this is a list of name, type, and comment fields.</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>clusteredBy</strong></td>
+ <td>An object describing how to cluster the table including the parameters
+ columnNames, sortedBy, numberOfBuckets. The sortedBy parameter includes
+ the parameters columnName and order. For further information
+ please refer to the examples below or to the
+ <a href="https://cwiki.apache.org/Hive/languagemanual-ddl.html#LanguageManualDDL-CreateTable">
+ Hive documentation.</a></td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>format</strong></td>
+ <td>Storage format description including paraeters for rowFormat, storedAs
+ and storedBy. For further information please refer to the examples below or to the
+ <a href="https://cwiki.apache.org/Hive/languagemanual-ddl.html#LanguageManualDDL-CreateTable">
+ Hive documentation.</a></td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>location</strong></td>
+ <td>The HDFS path</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>tableProperties</strong></td>
+ <td>A list of table property names and values (key/value pairs)</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ </table>
+ </section>
+
+ <section>
+ <title>Results</title>
+ <table>
+ <tr><th>Name</th><th>Description</th></tr>
+
+ <tr><td><strong>table</strong></td>
+ <td>The new table name</td>
+ </tr>
+
+ <tr><td><strong>database</strong></td>
+ <td>The database name</td>
+ </tr>
+
+ </table>
+ </section>
+
+ <section>
+ <title>Example</title>
+
+ <p><strong>Curl Command</strong></p>
+<source>
+% curl -s -X PUT -HContent-type:application/json -d '{
+ "comment": "Best table made today",
+ "columns": [
+ { "name": "id", "type": "bigint" },
+ { "name": "price", "type": "float", "comment": "The unit price" } ],
+ "partitionedBy": [
+ { "name": "country", "type": "string" } ],
+ "format": { "storedAs": "rcfile" } }' \
+ 'http://localhost:50111/templeton/v1/ddl/database/default/table/test_table?user.name=ctdean'
+</source>
+
+ <p><strong>Curl Command (using clusteredBy)</strong></p>
+<source>
+% curl -s -X PUT -HContent-type:application/json -d '{
+ "comment": "Best table made today",
+ "columns": [
+ { "name": "id", "type": "bigint"},
+ { "name": "price", "type": "float", "comment": "The unit price" } ],
+ "partitionedBy": [
+ { "name": "country", "type": "string" } ],
+ "clusteredBy": {
+ "columnNames": ["id"],
+ "sortedBy": [
+ { "columnName": "id", "order": "ASC" } ],
+ "numberOfBuckets": 10 },
+ "format": {
+ "storedAs": "rcfile",
+ "rowFormat": {
+ "fieldsTerminatedBy": "\u0001",
+ "serde": {
+ "name": "org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe",
+ "properties": {
+ "key": "value" } } } }
+ } ' \
+ 'http://localhost:50111/templeton/v1/ddl/database/default/table/test_table_c?user.name=ctdean'
+</source>
+
+ <p><strong>JSON Output</strong></p>
+<source>
+{
+ "table": "test_table",
+ "database": "default"
+}
+</source>
+
+ <p><strong>JSON Output (error)</strong></p>
+<source>
+{
+ "statement": "use default; create table test_table_c(id bigint, price float comment ...",
+ "error": "unable to create table: test_table_c",
+ "exec": {
+ "stdout": "",
+ "stderr": "WARNING: org.apache.hadoop.metrics.jvm.EventCounter is deprecated...
+ Hive history file=/tmp/ctdean/hive_job_log_ctdean_201204051335_2016086186.txt
+ SLF4J: Class path contains multiple SLF4J bindings.
+ SLF4J: Found binding in ...
+ SLF4J: See http://www.slf4j.org/codes.html#multiple_bindings for an explanation.
+ OK
+ Time taken: 0.448 seconds
+ FAILED: Error in semantic analysis: Operation not supported. HCatalog doesn't allow Clustered By in create table.
+ ",
+ "exitcode": 10
+ }
+}
+</source>
+
+ </section>
+ </body>
+</document>
Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createtablelike.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createtablelike.xml?rev=1365722&view=auto
==============================================================================
--- incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createtablelike.xml (added)
+++ incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/createtablelike.xml Wed Jul 25 20:29:44 2012
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document>
+ <header>
+ <title>PUT ddl/database/:db/table/:existingtable/like/:newtable</title>
+ </header>
+
+ <body>
+ <section>
+ <title>Description</title>
+ <p>Create a new HCatalog table like an existing one</p>
+ </section>
+
+ <section>
+ <title>URL</title>
+ <p><code>http://</code>www.myserver.com<code>/templeton/v1/ddl/database/</code>:db<code>/table/</code>:existingtable<code>/like/</code>:newtable</p>
+ </section>
+
+ <section>
+ <title>Parameters</title>
+ <table>
+ <tr><th>Name</th><th>Description</th><th>Required?</th><th>Default</th></tr>
+
+ <tr><td><strong>:db</strong></td>
+ <td>The database name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>:existingtable</strong></td>
+ <td>The existing table name</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>:newtable</strong></td>
+ <td>The new table name.</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>group</strong></td>
+ <td>The user group to use when creating a table</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>permissions</strong></td>
+ <td>The permissions string to use when creating a table.</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>external</strong></td>
+ <td>Allows you to specify a location so that Hive does not use the default
+ location for this table.</td>
+ <td>Optional</td>
+ <td>false</td>
+ </tr>
+
+ <tr><td><strong>ifNotExists</strong></td>
+ <td>If true, you will not receive an error if the table already exists.</td>
+ <td>Optional</td>
+ <td>false</td>
+ </tr>
+
+ <tr><td><strong>location</strong></td>
+ <td>The HDFS path</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ </table>
+ </section>
+
+ <section>
+ <title>Results</title>
+ <table>
+ <tr><th>Name</th><th>Description</th></tr>
+
+ <tr><td><strong>table</strong></td>
+ <td>The new table name</td>
+ </tr>
+
+ <tr><td><strong>database</strong></td>
+ <td>The database name</td>
+ </tr>
+
+ </table>
+ </section>
+
+ <section>
+ <title>Example</title>
+
+ <p><strong>Curl Command</strong></p>
+<source>
+% curl -s -X PUT -HContent-type:application/json -d {} \
+ 'http://localhost:50111/templeton/v1/ddl/database/default/table/test_table/like/test_table_2?user.name=ctdean'
+</source>
+
+ <p><strong>JSON Output</strong></p>
+<source>
+{
+ "table": "test_table_2",
+ "database": "default"
+}
+</source>
+ </section>
+ </body>
+</document>
Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/ddl.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/ddl.xml?rev=1365722&view=auto
==============================================================================
--- incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/ddl.xml (added)
+++ incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/ddl.xml Wed Jul 25 20:29:44 2012
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document>
+ <header>
+ <title>POST ddl </title>
+ </header>
+
+ <body>
+ <section>
+ <title>Description</title>
+ <p>Performs an <a href="http://incubator.apache.org/hcatalog/docs/r0.2.0/cli.html">
+ HCatalog DDL</a> command. The command is executed immediately upon request.
+ Responses are limited to 1MB. For requests which may return longer results
+ consider using the <a href="hive.html">Hive resource</a> as an alternative.</p>
+ </section>
+
+ <section>
+ <title>URL</title>
+ <p><code>http://</code>www.myserver.com<code>/templeton/v1/ddl</code></p>
+ </section>
+
+ <section>
+ <title>Parameters</title>
+ <table>
+ <tr><th>Name</th><th>Description</th><th>Required?</th><th>Default</th></tr>
+
+ <tr><td><strong>exec</strong></td>
+ <td>The HCatalog ddl string to execute</td>
+ <td>Required</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>group</strong></td>
+ <td>The user group to use when creating a table</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+
+ <tr><td><strong>permissions</strong></td>
+ <td>The permissions string to use when creating a table. The format is
+ "<code>rwxrw-r-x</code>".</td>
+ <td>Optional</td>
+ <td>None</td>
+ </tr>
+ </table>
+ </section>
+
+ <section>
+ <title>Results</title>
+ <table>
+ <tr><th>Name</th><th>Description</th></tr>
+
+ <tr><td><strong>stdout</strong></td>
+ <td>A string containing the result HCatalog sent to standard out (possibly empty).</td>
+ </tr>
+
+ <tr><td><strong>stderr</strong></td>
+ <td>A string containing the result HCatalog sent to standard error
+ (possibly empty).</td>
+ </tr>
+
+ <tr><td><strong>exitcode</strong></td>
+ <td>The exitcode HCatalog returned.</td>
+ </tr>
+ </table>
+ </section>
+
+ <section>
+ <title>Example</title>
+
+ <p><strong>Curl Command</strong></p>
+<source>
+% curl -s -d user.name=ctdean \
+ -d 'exec=show tables;' \
+ 'http://localhost:50111/templeton/v1/ddl'
+</source>
+
+ <p><strong>JSON Output</strong></p>
+<source>
+{
+ "stdout": "important_table
+ my_other_table
+ my_table
+ my_table_2
+ pokes
+ ",
+ "stderr": "WARNING: org.apache.hadoop.metrics.jvm.EventCounter is deprecated...
+ Hive history file=/tmp/ctdean/hive_job_log_ctdean_201111111258_2117356679.txt
+ OK
+ Time taken: 1.202 seconds
+ ",
+ "exitcode": 0
+}
+</source>
+
+ <p><strong>JSON Output (error)</strong></p>
+<source>
+{
+ "stdout": "",
+ "stderr": "WARNING: org.apache.hadoop.metrics.jvm.EventCounter is deprecated...
+ Hive history file=/tmp/ctdean/hive_job_log_ctdean_201204051246_689834593.txt
+ FAILED: Parse Error: line 1:5 Failed to recognize predicate 'tab'...
+
+ ",
+ "exitcode": 11
+}
+</source>
+
+ </section>
+ </body>
+</document>
Added: incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/ddlsummary.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/ddlsummary.xml?rev=1365722&view=auto
==============================================================================
--- incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/ddlsummary.xml (added)
+++ incubator/hcatalog/trunk/src/docs/src/documentation/content/xdocs/ddlsummary.xml Wed Jul 25 20:29:44 2012
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document>
+ <header>
+ <title>Templeton DDL Resources </title>
+ </header>
+ <body>
+ <table>
+ <tr><th>Resource</th><th>Description</th></tr>
+
+ <tr><td><a href="ddl.html">ddl</a></td>
+ <td>Performs an HCatalog DDL command.</td></tr>
+
+ <tr><td><a href="listdbs.html">ddl/database</a></td>
+ <td>List HCatalog databases.</td></tr>
+
+ <tr><td><a href="descdb.html">ddl/database/:db (GET)</a></td>
+ <td>Describe an HCatalog database.</td></tr>
+
+ <tr><td><a href="createdb.html">ddl/database/:db (PUT)</a></td>
+ <td>Create an HCatalog database.</td></tr>
+
+ <tr><td><a href="deletedb.html">ddl/database/:db (DELETE)</a></td>
+ <td>Delete (drop) an HCatalog database.</td></tr>
+
+ <tr><td><a href="listtables.html">ddl/database/:db/table</a></td>
+ <td>List the tables in an HCatalog database.</td></tr>
+
+ <tr><td><a href="desctable.html">ddl/database/:db/table/:table (GET)</a></td>
+ <td>Describe an HCatalog table.</td></tr>
+
+ <tr><td><a href="createtable.html">ddl/database/:db/table/:table (PUT)</a></td>
+ <td>Create a new HCatalog table.</td></tr>
+
+ <tr><td><a href="renametable.html">ddl/database/:db/table/:table (POST)</a></td>
+ <td>Rename an HCatalog table.</td></tr>
+
+ <tr><td><a href="deletetable.html">ddl/database/:db/table/:table (DELETE)</a></td>
+ <td>Delete (drop) an HCatalog table.</td></tr>
+
+ <tr><td><a href="createtablelike.html">ddl/database/:db/table/:existingtable/like/:newtable (PUT)</a></td>
+ <td>Create a new HCatalog table like an existing one.</td></tr>
+
+ <tr><td><a href="listpartitions.html">ddl/database/:db/table/:table/partion</a></td>
+ <td>List all partitions in an HCatalog table.</td></tr>
+
+ <tr><td><a href="descpartition.html">ddl/database/:db/table/:table/partion/:partition (GET)</a></td>
+ <td>Describe a single partition in an HCatalog table.</td></tr>
+
+ <tr><td><a href="createpartition.html">ddl/database/:db/table/:table/partion/:partition (PUT)</a></td>
+ <td>Create a partition in an HCatalog table.</td></tr>
+
+ <tr><td><a href="deletepartition.html">ddl/database/:db/table/:table/partion/:partition (DELETE)</a></td>
+ <td>Delete (drop) a partition in an HCatalog table.</td></tr>
+
+ <tr><td><a href="listcolumns.html">ddl/database/:db/table/:table/column</a></td>
+ <td>List the columns in an HCatalog table.</td></tr>
+
+ <tr><td><a href="desccolumn.html">ddl/database/:db/table/:table/column/:column (GET)</a></td>
+ <td>Describe a single column in an HCatalog table.</td></tr>
+
+ <tr><td><a href="createcolumn.html">ddl/database/:db/table/:table/column/:column (PUT)</a></td>
+ <td>Create a column in an HCatalog table.</td></tr>
+
+ <tr><td><a href="listproperties.html">ddl/database/:db/table/:table/property (GET)</a></td>
+ <td>List table properties.</td></tr>
+
+ <tr><td><a href="descproperty.html">ddl/database/:db/table/:table/property/:property (GET)</a></td>
+ <td>Return the value of a single table property.</td></tr>
+
+ <tr><td><a href="addproperty.html">ddl/database/:db/table/:table/property/:property (PUT)</a></td>
+ <td>Set a table property.</td></tr>
+
+ </table>
+ </body>
+</document>