HIVE-1526. Hive should depend on release version of Thrift (Carl Stei…

…nbach via Ning Zhang) git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1044070 13f79535-47bb-0310-9956-ffa450edef68
IT-DONG · Dec 9, 2010 · e3636ca · e3636ca
1 parent fa31870
commit e3636ca
Show file tree

Hide file tree

Showing 261 changed files with 40,815 additions and 26,104 deletions.
diff --git a/.classpath._hbase b/.classpath._hbase
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 build
 build-eclipse
-.classpath
+.classpath*
 .externalToolBuilders
 .project
 .settings

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -618,6 +618,11 @@ Trunk -  Unreleased
     HIVE-1658. Fix describe [extended] column formatting
     (Thiruvel Thirumoolan via Ning Zhang)
 
+  TASKS
+
+    HIVE-1526. Hive should depend on a release version of Thrift
+    (Carl Steinbach via Ning Zhang)
+
 Release 0.6.0 - 2010-10-19
 
   INCOMPATIBLE CHANGES

diff --git a/build-common.xml b/build-common.xml
@@ -25,6 +25,8 @@
   <property file="${user.home}/build.properties" />
   <property file="${basedir}/build.properties" />
 
+  <property environment="env"/>
+
   <property name="hive.conf.dir" value="${hive.root}/conf"/>
   <property name="dist.dir" location="${hive.root}"/>
 
@@ -34,6 +36,8 @@
   <property name="build.classes" location="${build.dir}/classes"/>
   <property name="build.encoding" value="ISO-8859-1"/>
 
+  <property name="thrift.args" value="-I ${thrift.home} --gen java:beans --gen cpp --gen php --gen py --gen rb"/>
+
   <property name="hadoop.conf.dir" location="${hadoop.root}/conf"/>
 
   <!-- configuration needed for tests -->
@@ -101,7 +105,7 @@
   </condition>
 
   <!--this is the naming policy for artifacts we want pulled down-->
-  <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
+  <property name="ivy.artifact.retrieve.pattern" value="[conf]/[artifact]-[revision].[ext]"/>
 
   <target name="ivy-init-dirs">
     <mkdir dir="${build.ivy.dir}" />
@@ -159,18 +163,18 @@
       log="${ivyresolvelog}"/>
   </target>
 
-  <target name="ivy-resolve-checkstyle" depends="ivy-init">
-    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="checkstyle"
-      log="${ivyresolvelog}"/>
-  </target>
-
-  <target name="ivy-retrieve" depends="ivy-resolve" unless="offline"
+  <target name="ivy-retrieve" depends="ivy-resolve"
     description="Retrieve Ivy-managed artifacts">
     <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
       pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
       log="${ivyresolvelog}"/>
   </target>
 
+  <target name="ivy-resolve-checkstyle" depends="ivy-init">
+    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="checkstyle"
+      log="${ivyresolvelog}"/>
+  </target>
+
   <target name="ivy-retrieve-checkstyle" depends="ivy-resolve-checkstyle"
     description="Retrieve Ivy-managed artifacts for the checkstyle configurations">
     <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
@@ -226,8 +230,8 @@
     <fileset dir="${build.dir.hive}" includes="*/*.jar"/>
     <fileset dir="${hive.root}/lib" includes="*.jar"/>
     <fileset dir="${hive.root}/ql/lib" includes="*.jar"/>
-    <fileset dir="${build.dir.hive}/ivy/lib/metastore/default" includes="*.jar"  excludes="*hadoop*.jar"
-	erroronmissingdir="false" />
+    <fileset dir="${build.ivy.lib.dir}/default" includes="*.jar" excludes="*hadoop*.jar"
+             erroronmissingdir="false"/>
   </path>
 
   <path id="classpath">
@@ -461,4 +465,15 @@
     <delete dir="${build.dir}"/>
   </target>
 
+  <target name="check-thrift-home">
+    <condition property="thrift.home.defined">
+      <or>
+        <not>
+          <isset property="thrift.home"/>
+        </not>
+        <equals arg1="${thrift.home}" arg2="$${thrift.home}" trim="true"/>
+      </or>
+    </condition>
+  </target>
+
 </project>
diff --git a/build.xml b/build.xml
@@ -25,6 +25,8 @@
   <property file="${user.home}/build.properties" />
   <property file="${basedir}/build.properties" />
 
+  <property environment="env"/>
+
   <property name="target.dir" location="${build.dir.hive}/dist"/>
   <property name="target.lib.dir" location="${target.dir}/lib"/>
   <property name="target.conf.dir" location="${target.dir}/conf"/>
@@ -91,6 +93,28 @@
     </sequential>
   </macrodef>
 
+  <macrodef name="iterate-test">
+    <attribute name="target"/>
+    <sequential>
+      <subant target="@{target}">
+	<property name="thrift.home" value="${thrift.home}"/>
+        <property name="build.dir.hive" location="${build.dir.hive}"/>
+        <filelist dir="." files="ql/build.xml,contrib/build.xml,hbase-handler/build.xml,hwi/build.xml,jdbc/build.xml,metastore/build.xml,odbc/build.xml,serde/build.xml,service/build.xml"/>
+      </subant>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="iterate-thriftif">
+    <attribute name="target"/>
+    <sequential>
+      <subant target="@{target}">
+	<property name="thrift.home" value="${thrift.home}"/>
+        <property name="build.dir.hive" location="${build.dir.hive}"/>
+        <filelist dir="." files="ql/build.xml,service/build.xml,metastore/build.xml,serde/build.xml"/>
+      </subant>
+    </sequential>
+  </macrodef>
+
   <macrodef name="iterate-all">
     <attribute name="target"/>
     <sequential>
@@ -121,7 +145,7 @@
     <fileset dir="${hive.root}" includes="hive-*.jar"/>
     <fileset dir="${hive.root}/lib" includes="*.jar"/>
     <fileset dir="${hive.root}/ql/lib" includes="*.jar"/>
-    <fileset dir="${build.dir.hive}/ivy/lib/metastore/default" includes="*.jar"
+    <fileset dir="${build.dir.hive}/ivy/lib/default" includes="*.jar"
 	excludes="*hadoop*.jar" erroronmissingdir="false"/>
   </path>
 
@@ -165,16 +189,24 @@
     <iterate target="compile"/>
   </target>
 
+  <target name="thriftif">
+    <iterate-thriftif target="thriftif"/>
+  </target>
+
   <target name="jar"
           description="Build JAR artifacts">
     <iterate target="jar"/>
   </target>
 
+  <target name="jar-test" depends="jar"
+          description="Build Java test artifacts">
+    <iterate-test target="compile-test"/>
+  </target>
+
   <target name="test"
           depends="clean-test,jar"
           description="Run tests">
     <iterate target="test"/>
-    <iterate-cpp target="test"/>
   </target>
 
   <!-- create an html report from junit output files -->
@@ -212,7 +244,7 @@
   <target name="clean-offline" if="offline">
     <!-- preserve the downloaded ivy .jar  -->
     <delete quiet="true" includeemptydirs="true">
-      <fileset dir="${build.dir.hive}" excludes="ivy/**/*"/>
+      <fileset dir="${build.dir.hive}" excludes="ivy/**/ivy*.jar"/>
     </delete>
   </target>
 
@@ -280,16 +312,16 @@
      <fileset dir="${hive.root}/service/lib/php" excludes="${vcs.excludes}"/>
     </copy>
     <copy todir="${target.lib.dir}/php/packages/serde">
-      <fileset dir="${hive.root}/serde/src/gen-php" excludes="${vcs.excludes}"/>
+      <fileset dir="${hive.root}/serde/src/gen/thrift/gen-php" excludes="${vcs.excludes}"/>
     </copy>
     <copy todir="${target.lib.dir}/php/packages/hive_metastore">
-      <fileset dir="${hive.root}/metastore/src/gen-php" excludes="${vcs.excludes}"/>
+      <fileset dir="${hive.root}/metastore/src/gen/thrift/gen-php" excludes="${vcs.excludes}"/>
     </copy>
     <copy todir="${target.lib.dir}/php/packages/hive_service">
-      <fileset dir="${hive.root}/service/src/gen-php" excludes="${vcs.excludes}"/>
+      <fileset dir="${hive.root}/service/src/gen/thrift/gen-php" excludes="${vcs.excludes}"/>
     </copy>
     <copy todir="${target.lib.dir}/php/packages/queryplan">
-      <fileset dir="${hive.root}/ql/src/gen-php" excludes="${vcs.excludes}"/>
+      <fileset dir="${hive.root}/ql/src/gen/thrift/gen-php" excludes="${vcs.excludes}"/>
     </copy>
 
 
@@ -298,16 +330,16 @@
       <fileset dir="${hive.root}/service/lib/py" excludes="${vcs.excludes}"/>
     </copy>
     <copy todir="${target.lib.dir}/py/hive_serde">
-      <fileset dir="${hive.root}/serde/src/gen-py/org_apache_hadoop_hive_serde" excludes="${vcs.excludes}"/>
+      <fileset dir="${hive.root}/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde" excludes="${vcs.excludes}"/>
     </copy>
     <copy todir="${target.lib.dir}/py/hive_metastore">
-      <fileset dir="${hive.root}/metastore/src/gen-py/hive_metastore" excludes="${vcs.excludes}"/>
+      <fileset dir="${hive.root}/metastore/src/gen/thrift/gen-py/hive_metastore" excludes="${vcs.excludes}"/>
     </copy>
     <copy todir="${target.lib.dir}/py/hive_service">
-      <fileset dir="${hive.root}/service/src/gen-py/hive_service" excludes="${vcs.excludes}"/>
+      <fileset dir="${hive.root}/service/src/gen/thrift/gen-py/hive_service" excludes="${vcs.excludes}"/>
     </copy>
     <copy todir="${target.lib.dir}/py/queryplan">
-      <fileset dir="${hive.root}/ql/src/gen-py/queryplan" excludes="${vcs.excludes}"/>
+      <fileset dir="${hive.root}/ql/src/gen/thrift/gen-py/queryplan" excludes="${vcs.excludes}"/>
     </copy>
 
     <!-- copy jar files -->
@@ -320,7 +352,7 @@
       <fileset file="${build.dir.hive}/hwi/hive-hwi-${version}.war"/>
       <fileset file="${build.dir.hive}/contrib/hive-contrib-${version}.jar"/>
       <fileset file="${build.dir.hive}/contrib/hive-hbase_handler-${version}.jar"/>
-      <fileset dir="${build.dir.hive}/ivy/lib/metastore/default">
+      <fileset dir="${build.dir.hive}/ivy/lib/default">
         <include name="*.jar"/>
         <exclude name="*.tar.gz"/>
       </fileset>
@@ -449,18 +481,21 @@
       <packageset dir="common/src/java"/>
       <packageset dir="service/src/java"/>
       <packageset dir="service/src/test"/>
-      <packageset dir="service/src/gen-javabean"/>
+      <packageset dir="service/src/gen/thrift/gen-javabean"/>
       <packageset dir="serde/src/java"/>
       <packageset dir="serde/src/test"/>
-      <packageset dir="serde/src/gen-java"/>
+      <packageset dir="serde/src/gen/thrift/gen-javabean"/>
+      <packageset dir="serde/src/gen/protobuf/gen-java"/>
       <packageset dir="jdbc/src/java"/>
       <packageset dir="jdbc/src/test"/>
       <packageset dir="metastore/src/java"/>
       <packageset dir="metastore/src/test"/>
-      <packageset dir="metastore/src/gen-javabean"/>
+      <packageset dir="metastore/src/gen/thrift/gen-javabean"/>
       <packageset dir="metastore/src/model"/>
       <packageset dir="cli/src/java"/>
       <packageset dir="ql/src/java"/>
+      <packageset dir="ql/src/test"/>
+      <packageset dir="ql/src/gen/thrift/gen-javabean"/>
       <packageset dir="${build.dir.hive}/ql/gen-java"/>
       <packageset dir="shims/src/common/java"/>
 

diff --git a/eclipse-templates/.classpath b/eclipse-templates/.classpath
@@ -16,10 +16,10 @@
   <classpathentry exported="true" kind="lib" path="lib/commons-logging-@commons-logging.version@.jar"/>
   <classpathentry exported="true" kind="lib" path="lib/commons-logging-api-@commons-logging-api.version@.jar"/>
   <classpathentry exported="true" kind="lib" path="lib/derby.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/hbase-0.20.3.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/hbase-0.20.3-test.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/libfb303.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/libthrift.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/hbase-@hbase.version@.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/hbase-@hbase-test.version@-test.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/thrift-fb303-@thrift-fb303.version@.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/thrift-@thrift.version@.jar"/>
   <classpathentry exported="true" kind="lib" path="lib/zookeeper-@zookeeper.version@.jar"/>
   <classpathentry exported="true" kind="lib" path="lib/log4j-@log4j.version@.jar"/>
   <classpathentry exported="true" kind="lib" path="ql/lib/antlr-@antlr.version@.jar"/>
@@ -33,25 +33,28 @@
   <classpathentry kind="lib" path="build/dist/lib/commons-dbcp-@commons-dbcp.version@.jar"/>
   <classpathentry kind="lib" path="build/dist/lib/datanucleus-connectionpool-@datanucleus-connectionpool.version@.jar"/>
   <classpathentry kind="lib" path="build/dist/lib/commons-pool-@commons-pool.version@.jar"/>
-  <classpathentry kind="src" path="build/metastore/gen-java"/>
-  <classpathentry kind="src" path="build/ql/gen-java"/>
+  <classpathentry kind="lib" path="build/dist/lib/slf4j-api-@slf4j-api.version@.jar"/>
+  <classpathentry kind="lib" path="build/dist/lib/slf4j-log4j12-@slf4j-log4j12.version@.jar"/>
   <classpathentry kind="src" path="build/contrib/test/src"/>
+  <classpathentry kind="src" path="build/metastore/gen/antlr/gen-java"/>
   <classpathentry kind="src" path="build/ql/test/src"/>
+  <classpathentry kind="src" path="build/ql/gen/antlr/gen-java"/>
   <classpathentry kind="src" path="cli/src/java"/>
   <classpathentry kind="src" path="common/src/java"/>
   <classpathentry kind="src" path="contrib/src/java"/>
   <classpathentry kind="src" path="contrib/src/test"/>
-  <classpathentry kind="src" path="metastore/src/gen-javabean"/>
+  <classpathentry kind="src" path="metastore/src/gen/thrift/gen-javabean"/>
   <classpathentry kind="src" path="metastore/src/java"/>
   <classpathentry kind="src" path="metastore/src/model"/>
   <classpathentry kind="src" path="metastore/src/test"/>
-  <classpathentry kind="src" path="ql/src/gen-javabean"/>
+  <classpathentry kind="src" path="ql/src/gen/thrift/gen-javabean"/>
   <classpathentry kind="src" path="ql/src/java"/>
   <classpathentry kind="src" path="ql/src/test"/>
-  <classpathentry kind="src" path="serde/src/gen-java"/>
+  <classpathentry kind="src" path="serde/src/gen/thrift/gen-javabean"/>
+  <classpathentry kind="src" path="serde/src/gen/protobuf/gen-java"/>
   <classpathentry kind="src" path="serde/src/java"/>
   <classpathentry kind="src" path="serde/src/test"/>
-  <classpathentry kind="src" path="service/src/gen-javabean"/>
+  <classpathentry kind="src" path="service/src/gen/thrift/gen-javabean"/>
   <classpathentry kind="src" path="service/src/java"/>
   <classpathentry kind="src" path="service/src/test"/>
   <classpathentry kind="src" path="jdbc/src/java"/>