You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2013/08/06 01:18:00 UTC
svn commit: r1510803 - in /hive/branches/tez: build-common.xml build.xml
eclipse-templates/.classpath ivy/libraries.properties ql/ivy.xml
shims/ivy.xml
Author: gunther
Date: Mon Aug 5 23:18:00 2013
New Revision: 1510803
URL: http://svn.apache.org/r1510803
Log:
HIVE-4826: Setup build infrastructure for tez (Vikram Dixit via Gunther Hagleitner)
Modified:
hive/branches/tez/build-common.xml
hive/branches/tez/build.xml
hive/branches/tez/eclipse-templates/.classpath
hive/branches/tez/ivy/libraries.properties
hive/branches/tez/ql/ivy.xml
hive/branches/tez/shims/ivy.xml
Modified: hive/branches/tez/build-common.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/build-common.xml?rev=1510803&r1=1510802&r2=1510803&view=diff
==============================================================================
--- hive/branches/tez/build-common.xml (original)
+++ hive/branches/tez/build-common.xml Mon Aug 5 23:18:00 2013
@@ -75,6 +75,16 @@
</condition>
<target name="set-test-classpath">
+ <if>
+ <equals arg1="${hadoop.use.tez}" arg2="true"/>
+ <then>
+ <fileset id="hive.tez.fileset" dir="${build.dir.hive}/ivy/lib/default" includes="**/tez-*.jar" erroronmissingdir="false"/>
+ </then>
+ <else>
+ <fileset id="hive.tez.fileset" dir="${build.dir.hive}/ivy/lib/default" includes="" excludes="*.jar" erroronmissingdir="false"/>
+ </else>
+ </if>
+
<typedef name="distinctelementsclasspath" classname="org.apache.hadoop.hive.ant.DistinctElementsClassPath"
classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${build.ivy.lib.dir}/default/commons-collections-${commons-collections.version}.jar:${build.ivy.lib.dir}/default/commons-lang-${commons-lang.version}.jar"/>
<distinctelementsclasspath id="test.classpath">
@@ -97,7 +107,8 @@
<pathelement location="${build.dir.hive}/shims/test/classes"/>
<!-- Include build/dist/lib on the classpath before Ivy and exclude hive jars from Ivy to make sure we get the local changes when we test Hive -->
- <fileset dir="${build.dir.hive}/dist/lib" includes="*.jar" erroronmissingdir="false" excludes="**/hive_contrib*.jar,**/hive-contrib*.jar,**/lib*.jar"/>
+ <fileset refid="hive.tez.fileset"/>
+ <fileset dir="${build.dir.hive}/dist/lib" includes="*.jar" erroronmissingdir="false" excludes="**/hive_contrib*.jar,**/hive-contrib*.jar,**/lib*.jar,**/tez-*.jar"/>
<fileset dir="${hive.root}/testlibs" includes="*.jar"/>
<fileset dir="${build.ivy.lib.dir}/hadoop0.${hadoop.mr.rev}.shim" includes="*.jar" erroronmissingdir="false" />
<pathelement location="${build.classes}" />
@@ -193,7 +204,6 @@
<fileset dir="${build.ivy.lib.dir}/default" includes="junit*.jar" />
<fileset dir="${build.ivy.lib.dir}/hadoop0.${hadoop.mr.rev}.shim" includes="*.jar" erroronmissingdir="false" />
<fileset dir="${build.ivy.lib.dir}/default" includes="*.jar"
- excludes="**/hadoop-*.jar"
erroronmissingdir="false"/>
</path>
Modified: hive/branches/tez/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/build.xml?rev=1510803&r1=1510802&r2=1510803&view=diff
==============================================================================
--- hive/branches/tez/build.xml (original)
+++ hive/branches/tez/build.xml Mon Aug 5 23:18:00 2013
@@ -521,6 +521,7 @@
<exclude name="**/ant-contrib*.jar"/>
<exclude name="**/hive-anttasks*.jar"/>
<exclude name="**/hive-testutils*.jar"/>
+ <exclude name="**/tez-*.jar"/>
</fileset>
<fileset file="${build.dir.hive}/beeline/hive-beeline-${version}.jar" erroronmissingdir="false"/>
<fileset file="${build.dir.hive}/cli/hive-cli-${version}.jar" erroronmissingdir="false"/>
@@ -540,6 +541,7 @@
<exclude name="**/mockito*.jar"/>
<exclude name="**/velocity*.jar"/>
<exclude name="**/antlr-3*.jar"/>
+ <exclude name="**/tez-*.jar"/>
</fileset>
</copy>
<copy todir="${target.example.dir}/files" preservelastmodified="true" flatten="true">
Modified: hive/branches/tez/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hive/branches/tez/eclipse-templates/.classpath?rev=1510803&r1=1510802&r2=1510803&view=diff
==============================================================================
--- hive/branches/tez/eclipse-templates/.classpath (original)
+++ hive/branches/tez/eclipse-templates/.classpath Mon Aug 5 23:18:00 2013
@@ -87,6 +87,12 @@
<classpathentry kind="lib" path="build/ivy/lib/default/snappy-@snappy.version@.jar"/>
<classpathentry kind="lib" path="build/beeline/hive-beeline-@HIVE_VERSION@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/tempus-fugit-@tempus-fugit.version@.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/tez-common-@tez.version@.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/tez-dag-@tez.version@.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/tez-dag-api-@tez.version@.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/tez-engine-@tez.version@.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/tez-engine-api-@tez.version@.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/tez-mapreduce-@tez.version@.jar"/>
<classpathentry kind="src" path="build/contrib/test/src"/>
<classpathentry kind="src" path="build/metastore/gen/antlr/gen-java"/>
<classpathentry kind="lib" path="build/testutils/hive-testutils-@HIVE_VERSION@.jar"/>
Modified: hive/branches/tez/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/branches/tez/ivy/libraries.properties?rev=1510803&r1=1510802&r2=1510803&view=diff
==============================================================================
--- hive/branches/tez/ivy/libraries.properties (original)
+++ hive/branches/tez/ivy/libraries.properties Mon Aug 5 23:18:00 2013
@@ -67,3 +67,6 @@ velocity.version=1.5
metrics-core.version=2.1.2
zookeeper.version=3.4.3
javolution.version=5.5.1
+tez.version=0.2.0-SNAPSHOT
+mina.version=2.0.0-M5
+
Modified: hive/branches/tez/ql/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/ivy.xml?rev=1510803&r1=1510802&r2=1510803&view=diff
==============================================================================
--- hive/branches/tez/ql/ivy.xml (original)
+++ hive/branches/tez/ql/ivy.xml Mon Aug 5 23:18:00 2013
@@ -26,6 +26,8 @@
<include file="${ivy.conf.dir}/common-configurations.xml"/>
</configurations>
<dependencies>
+ <dependency org="org.apache.mina" name="mina-core" rev="${mina.version}"
+ conf="compile->default" />
<dependency org="org.apache.hive" name="hive-metastore" rev="${version}"
conf="compile->default" />
<dependency org="org.apache.hive" name="hive-hbase-handler" rev="${version}"
@@ -44,6 +46,19 @@
rev="${protobuf.version}" transitive="false"/>
<dependency org="org.iq80.snappy" name="snappy"
rev="${snappy.version}" transitive="false"/>
+ <dependency org="org.apache.tez" name="tez-dag-api" rev="${tez.version}" conf="compile->master" />
+ <dependency org="org.apache.tez" name="tez-dag" rev="${tez.version}" conf="compile->master" />
+ <dependency org="org.apache.tez" name="tez-engine-api" rev="${tez.version}" conf="compile->master" />
+ <dependency org="org.apache.tez" name="tez-common" rev="${tez.version}" conf="compile->master" />
+ <dependency org="org.apache.tez" name="tez-engine" rev="${tez.version}" conf="compile->master" />
+ <dependency org="org.apache.tez" name="tez-mapreduce" rev="${tez.version}" conf="compile->master" />
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-api" rev="${hadoop-0.23.version}"
+ conf="compile->master" transitive="false" />
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common" rev="${hadoop-0.23.version}"
+ conf="compile->master" transitive="false" />
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-client" rev="${hadoop-0.23.version}"
+ conf="compile->master" transitive="false" />
+
<!-- hadoop specific guava -->
<dependency org="org.json" name="json" rev="${json.version}"/>
Modified: hive/branches/tez/shims/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/shims/ivy.xml?rev=1510803&r1=1510802&r2=1510803&view=diff
==============================================================================
--- hive/branches/tez/shims/ivy.xml (original)
+++ hive/branches/tez/shims/ivy.xml Mon Aug 5 23:18:00 2013
@@ -52,6 +52,11 @@
<exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
<exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
</dependency>
+ <dependency org="org.apache.tez" name="tez-mapreduce-tests" rev="${tez.version}" conf="hadoop0.23.shim->default">
+ <artifact name="tez-mapreduce-tests" ext="jar"/>
+ <artifact name="tez-mapreduce-tests" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
+
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
rev="${hadoop-0.23.version}"
conf="hadoop0.23.shim->default">