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/03/12 21:36:29 UTC
svn commit: r1299881 - in /incubator/hcatalog/trunk: CHANGES.txt build.xml
src/test/e2e/hcatalog/conf/default.conf storage-drivers/ storage-handlers/
storage-handlers/build.xml storage-handlers/hbase/build.xml
Author: gates
Date: Mon Mar 12 21:36:29 2012
New Revision: 1299881
URL: http://svn.apache.org/viewvc?rev=1299881&view=rev
Log:
HCATALOG-295 Rename storage-drivers directory to storage-handlers
Added:
incubator/hcatalog/trunk/storage-handlers/
- copied from r1299880, incubator/hcatalog/trunk/storage-drivers/
Removed:
incubator/hcatalog/trunk/storage-drivers/
Modified:
incubator/hcatalog/trunk/CHANGES.txt
incubator/hcatalog/trunk/build.xml
incubator/hcatalog/trunk/src/test/e2e/hcatalog/conf/default.conf
incubator/hcatalog/trunk/storage-handlers/build.xml
incubator/hcatalog/trunk/storage-handlers/hbase/build.xml
Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1299881&r1=1299880&r2=1299881&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Mon Mar 12 21:36:29 2012
@@ -34,6 +34,8 @@ Trunk (unreleased changes)
Release 0.4.0 - Unreleased
INCOMPATIBLE CHANGES
+ HCAT-295 Rename storage-drivers directory to storage-handlers (gates)
+
HCAT-264 Barrier for HCatOutputFormat for Pig/Mapreduce if the table contains feature only supported in Hive (daijy via gates)
HCAT-279 Remove remaining code mentioning isd/osd (daijy via gates)
Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1299881&r1=1299880&r2=1299881&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Mon Mar 12 21:36:29 2012
@@ -281,16 +281,16 @@
Build both clientjar and server-extensions
================================================================================
-->
- <target name="jar" depends="clientjar,server-extensions,jar-storage-drivers"/>
+ <target name="jar" depends="clientjar,server-extensions,jar-storage-handlers"/>
<!--
================================================================================
- Build storage drivers
+ Build storage handlers
================================================================================
-->
- <target name="jar-storage-drivers">
- <ant target="jar" dir="storage-drivers" inheritAll="false" useNativeBasedir="true"/>
+ <target name="jar-storage-handlers">
+ <ant target="jar" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
</target>
<!--
@@ -311,8 +311,8 @@
</target>
<!-- Run the unit tests -->
- <target name="test-storage-drivers">
- <ant target="test" dir="storage-drivers" inheritAll="false" useNativeBasedir="true"/>
+ <target name="test-storage-handlers">
+ <ant target="test" dir="storage-handlers" inheritAll="false" useNativeBasedir="true"/>
</target>
<target name="test" depends="compile-test">
@@ -355,8 +355,8 @@
</junit>
<fail if="tests.failed">Tests failed!</fail>
</sequential>
- <!-- test storage drivers -->
- <antcall target="test-storage-drivers"/>
+ <!-- test storage handlers -->
+ <antcall target="test-storage-handlers"/>
</target>
<!--
@@ -423,14 +423,14 @@
Distribution Section
===============================================================================
-->
- <target name="package-storage-drivers">
- <property name="drivers.dir" value="${dist.dir}/share/hcatalog/storage-drivers"/>
- <mkdir dir="${drivers.dir}"/>
- <ant target="package" dir="storage-drivers" inheritAll="false" useNativeBasedir="true">
- <property name="dist.drivers.dir" value="${drivers.dir}"/>
+ <target name="package-storage-handlers">
+ <property name="handlers.dir" value="${dist.dir}/share/hcatalog/storage-handlers"/>
+ <mkdir dir="${handlers.dir}"/>
+ <ant target="package" dir="storage-handlers" inheritAll="false" useNativeBasedir="true">
+ <property name="dist.handlers.dir" value="${handlers.dir}"/>
</ant>
<copy todir="${dist.dir}/share/${ant.project.name}/lib" includeEmptyDirs="false" flatten="true">
- <fileset dir="${dist.dir}/share/${ant.project.name}/storage-drivers">
+ <fileset dir="${dist.dir}/share/${ant.project.name}/storage-handlers">
<include name="*/lib/*"/>
</fileset>
</copy>
@@ -627,8 +627,8 @@
<fileset dir="${dist.dir}/bin" />
<fileset dir="${dist.dir}/sbin" />
</chmod>
- <!--package storage-drivers -->
- <antcall target="package-storage-drivers"/>
+ <!--package storage-handlers -->
+ <antcall target="package-storage-handlers"/>
</target>
<target name="releaseaudit" depends="ivy-releaseaudit, package" description="Release Audit activities">
@@ -669,7 +669,7 @@
<include name="license/**"/>
<include name="shims/**"/>
<include name="src/**"/>
- <include name="storage-drivers/**"/>
+ <include name="storage-handlers/**"/>
<include name="*.txt"/>
<include name="*.xml"/>
<include name="KEYS"/>
Modified: incubator/hcatalog/trunk/src/test/e2e/hcatalog/conf/default.conf
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/e2e/hcatalog/conf/default.conf?rev=1299881&r1=1299880&r2=1299881&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/test/e2e/hcatalog/conf/default.conf (original)
+++ incubator/hcatalog/trunk/src/test/e2e/hcatalog/conf/default.conf Mon Mar 12 21:36:29 2012
@@ -62,7 +62,7 @@ $cfg = {
, 'hcat_data_dir' => '/user/hcat/tests/data'
, 'hivehome' => $ENV{'PH_HIVE_HOME'}
, 'hcathome' => $ENV{'HCAT_INSTALL_DIR'}
- , 'hcatalog.jar' => "$ENV{HCAT_JAR},$ENV{HIVE_ROOT}/build/dist/lib/hive-serde-$hive_version.jar,$ENV{HIVE_ROOT}/build/dist/lib/hive-exec-$hive_version.jar,$ENV{PIG_HOME}/pig-0.9.2-withouthadoop.jar,$ENV{HIVE_ROOT}/build/dist/lib/hive-metastore-$hive_version.jar,$ENV{HIVE_ROOT}/build/dist/lib/libfb303-0.7.0.jar,$ENV{HIVE_ROOT}/build/dist/lib/jdo2-api-2.3-ec.jar,$ENV{HCAT_ROOT}/storage-drivers/hbase/build/ivy/lib/hbase-storage-driver/hbase-0.92.0-SNAPSHOT.jar,$ENV{HCAT_ROOT}/storage-drivers/hbase/build/ivy/lib/hbase-storage-driver/zookeeper-3.4.3.jar,$ENV{HCAT_ROOT}/storage-drivers/hbase/build/hbase-storage-driver/hbase-storage-driver-0.1.0.jar,$ENV{HCAT_ROOT}/hive/external/build/dist/lib/hive-hbase-handler-$hive_version.jar"
+ , 'hcatalog.jar' => "$ENV{HCAT_JAR},$ENV{HIVE_ROOT}/build/dist/lib/hive-serde-$hive_version.jar,$ENV{HIVE_ROOT}/build/dist/lib/hive-exec-$hive_version.jar,$ENV{PIG_HOME}/pig-0.9.2-withouthadoop.jar,$ENV{HIVE_ROOT}/build/dist/lib/hive-metastore-$hive_version.jar,$ENV{HIVE_ROOT}/build/dist/lib/libfb303-0.7.0.jar,$ENV{HIVE_ROOT}/build/dist/lib/jdo2-api-2.3-ec.jar,$ENV{HCAT_ROOT}/storage-handlers/hbase/build/ivy/lib/hbase-storage-handler/hbase-0.92.0-SNAPSHOT.jar,$ENV{HCAT_ROOT}/storage-handlers/hbase/build/ivy/lib/hbase-storage-handler/zookeeper-3.4.3.jar,$ENV{HCAT_ROOT}/storage-handlers/hbase/build/hbase-storage-handler/hbase-storage-handler-0.1.0.jar,$ENV{HCAT_ROOT}/hive/external/build/dist/lib/hive-hbase-handler-$hive_version.jar"
#PIG
, 'testconfigpath' => "$ENV{PH_CLUSTER}"
@@ -72,7 +72,7 @@ $cfg = {
, 'pigpath' => "$ENV{PIG_HOME}"
, 'pigjar' => "$ENV{PIG_JAR}" # Pig jar that doesn't have Antlr
, 'oldpigpath' => "$ENV{PH_OLDPIG}"
- , 'additionaljars' => "$ENV{HCAT_ROOT}/build/hcatalog/hcatalog-0.5.0.jar:$ENV{HCAT_ROOT}/hive/external/build/metastore/hive-metastore-$hive_version.jar:$ENV{HCAT_ROOT}/hive/external/build/dist/lib/libthrift.jar:$ENV{HCAT_ROOT}/hive/external/build/dist/lib/hive-exec-$hive_version.jar:$ENV{HCAT_ROOT}/hive/external/build/dist/lib/libfb303.jar:$ENV{HCAT_ROOT}/hive/external/build/dist/lib/jdo2-api-2.3-ec.jar::$ENV{HCAT_ROOT}/storage-drivers/hbase/build/ivy/lib/hbase-storage-driver/hbase-0.92.0-SNAPSHOT.jar:$ENV{HCAT_ROOT}/storage-drivers/hbase/build/ivy/lib/hbase-storage-driver/zookeeper-3.4.3.jar:$ENV{HCAT_ROOT}/storage-drivers/hbase/build/hbase-storage-driver/hbase-storage-driver-0.1.0.jar:$ENV{HCAT_ROOT}/hive/external/build/dist/lib/hive-hbase-handler-$hive_version.jar:$ENV{'HCAT_INSTALL_DIR'}/etc/hcatalog"
+ , 'additionaljars' => "$ENV{HCAT_ROOT}/build/hcatalog/hcatalog-0.5.0.jar:$ENV{HCAT_ROOT}/hive/external/build/metastore/hive-metastore-$hive_version.jar:$ENV{HCAT_ROOT}/hive/external/build/dist/lib/libthrift.jar:$ENV{HCAT_ROOT}/hive/external/build/dist/lib/hive-exec-$hive_version.jar:$ENV{HCAT_ROOT}/hive/external/build/dist/lib/libfb303.jar:$ENV{HCAT_ROOT}/hive/external/build/dist/lib/jdo2-api-2.3-ec.jar::$ENV{HCAT_ROOT}/storage-handlers/hbase/build/ivy/lib/hbase-storage-handler/hbase-0.92.0-SNAPSHOT.jar:$ENV{HCAT_ROOT}/storage-handlers/hbase/build/ivy/lib/hbase-storage-handler/zookeeper-3.4.3.jar:$ENV{HCAT_ROOT}/storage-handlers/hbase/build/hbase-storage-handler/hbase-storage-handler-0.1.0.jar:$ENV{HCAT_ROOT}/hive/external/build/dist/lib/hive-hbase-handler-$hive_version.jar:$ENV{'HCAT_INSTALL_DIR'}/etc/hcatalog"
#HADOOP
, 'hadoopHome' => "$ENV{HCAT_ROOT}/lib"
Modified: incubator/hcatalog/trunk/storage-handlers/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/build.xml?rev=1299881&r1=1299880&r2=1299881&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/build.xml (original)
+++ incubator/hcatalog/trunk/storage-handlers/build.xml Mon Mar 12 21:36:29 2012
@@ -17,41 +17,41 @@
-->
-<project name="storage-driver" default="jar" xmlns:ivy="antlib:org.apache.ivy.ant" >
- <!-- Used to pass calls to storage drivers. -->
+<project name="storage-handlers" default="jar" xmlns:ivy="antlib:org.apache.ivy.ant" >
+ <!-- Used to pass calls to storage handlers. -->
<target name="template">
- <condition property="dist.drivers.dir" value="${dist.drivers.dir}">
- <isset property="dist.drivers.dir"/>
+ <condition property="dist.handlers.dir" value="${dist.handlers.dir}">
+ <isset property="dist.handlers.dir"/>
</condition>
- <!-- add storage drivers here -->
- <echo>Executing storage-driver "${target}" for hbase</echo>
+ <!-- add storage handlers here -->
+ <echo>Executing storage-handler "${target}" for hbase</echo>
<ant target="${target}" dir="hbase" inheritAll="false" useNativeBasedir="true"/>
</target>
<target name="jar">
- <echo>Generating all drivers</echo>
+ <echo>Generating all handlers</echo>
<antcall target="template">
<param name="target" value="jar"/>
</antcall>
</target>
<target name="test">
- <echo>Testing all drivers</echo>
+ <echo>Testing all handlers</echo>
<antcall target="template">
<param name="target" value="test"/>
</antcall>
</target>
<target name="clean">
- <echo>Cleaning all drivers</echo>
+ <echo>Cleaning all handlers</echo>
<antcall target="template">
<param name="target" value="clean"/>
</antcall>
</target>
<target name="package">
- <echo>Package all drivers</echo>
+ <echo>Package all handlers</echo>
<antcall target="template">
<param name="target" value="package"/>
</antcall>
Modified: incubator/hcatalog/trunk/storage-handlers/hbase/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/build.xml?rev=1299881&r1=1299880&r2=1299881&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/build.xml (original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/build.xml Mon Mar 12 21:36:29 2012
@@ -18,7 +18,7 @@
-->
-<project name="hbase-storage-driver" default="jar" xmlns:ivy="antlib:org.apache.ivy.ant" >
+<project name="hbase-storage-handler" default="jar" xmlns:ivy="antlib:org.apache.ivy.ant" >
<!--
================================================================================
Import File
@@ -32,9 +32,9 @@
================================================================================
-->
<!-- name and version -->
- <property name="driver.version" value="0.1.0"/>
- <property name="driver.jar" value="${ant.project.name}-${driver.version}.jar"/>
- <property name="final.name" value="${ant.project.name}-${driver.version}" />
+ <property name="handler.version" value="0.1.0"/>
+ <property name="handler.jar" value="${ant.project.name}-${handler.version}.jar"/>
+ <property name="final.name" value="${ant.project.name}-${handler.version}" />
<property name="hcatalog.dir" value="${basedir}/../../" />
<!-- hive properties -->
@@ -117,7 +117,7 @@
<include name="hadoop-test-*.jar" />
</fileset>
<path refid="classpath"/>
- <pathelement location="${driver.jar}"/>
+ <pathelement location="${handler.jar}"/>
<!-- jars Hive depends on -->
<fileset dir="${hive.root}/build/ivy/lib/default/">
<include name="**/*.jar" />
@@ -217,7 +217,7 @@
<!-- Build the jar -->
<target name="jar" depends="compile-src">
- <jar jarfile="${build.dir}/${ant.project.name}/${driver.jar}" basedir="${build.classes}"/>
+ <jar jarfile="${build.dir}/${ant.project.name}/${handler.jar}" basedir="${build.classes}"/>
</target>
<!--
@@ -355,12 +355,12 @@
<copy todir="${dist.dir}/ivy">
<fileset dir="ivy"/>
</copy>
- <antcall target="package-to-drivers"/>
+ <antcall target="package-to-handlers"/>
</target>
- <target name="package-to-drivers" if="dist.drivers.dir">
- <mkdir dir="${dist.drivers.dir}/hbase"/>
- <copy todir="${dist.drivers.dir}/hbase" includeEmptyDirs="true">
+ <target name="package-to-handlers" if="dist.handlers.dir">
+ <mkdir dir="${dist.handlers.dir}/hbase"/>
+ <copy todir="${dist.handlers.dir}/hbase" includeEmptyDirs="true">
<fileset dir="${dist.dir}"/>
</copy>
</target>