You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/09/12 03:21:29 UTC
svn commit: r1522098 [13/30] - in /hive/branches/vectorization: ./
beeline/src/test/org/apache/hive/beeline/src/test/ bin/ bin/ext/
common/src/java/org/apache/hadoop/hive/common/
common/src/java/org/apache/hadoop/hive/conf/ conf/ contrib/src/java/org/a...
Modified: hive/branches/vectorization/ql/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/build.xml?rev=1522098&r1=1522097&r2=1522098&view=diff
==============================================================================
--- hive/branches/vectorization/ql/build.xml (original)
+++ hive/branches/vectorization/ql/build.xml Thu Sep 12 01:21:10 2013
@@ -250,15 +250,33 @@
<exclude name="META-INF/MANIFEST.MF"/>
</patternset>
</unzip>
- <unzip
- src="${build.ivy.lib.dir}/default/protobuf-java-${protobuf.version}.jar"
+ <unzip
+ src="${build.ivy.lib.dir}/default/kryo-${kryo.version}.jar"
+ dest="${build.dir.hive}/kryo/classes">
+ <patternset>
+ <exclude name="META-INF"/>
+ <exclude name="META-INF/MANIFEST.MF"/>
+ </patternset>
+ </unzip>
+
+ <unzip
+ src="${build.ivy.lib.dir}/default/protobuf-java-${protobuf.version}.jar"
dest="${build.dir.hive}/protobuf-java/classes">
<patternset>
<exclude name="META-INF"/>
<exclude name="META-INF/MANIFEST.MF"/>
</patternset>
</unzip>
- <unzip
+ <unzip
+ src="${build.ivy.lib.dir}/default/guava-${guava.version}.jar"
+ dest="${build.dir.hive}/guava/classes">
+ <patternset>
+ <exclude name="META-INF"/>
+ <exclude name="META-INF/MANIFEST.MF"/>
+ </patternset>
+ </unzip>
+
+ <unzip
src="${build.ivy.lib.dir}/default/snappy-${snappy.version}.jar"
dest="${build.dir.hive}/snappy/classes">
<patternset>
@@ -289,21 +307,20 @@
<fileset dir="${build.dir.hive}/ql/classes" includes="**/*.class,**/*.properties"/>
<fileset dir="${build.dir.hive}/serde/classes" includes="**/*.class"/>
<fileset dir="${build.dir.hive}/thrift/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/commons-lang/classes" includes="**/StringUtils.class,**/WordUtils.class"/>
+
+ <fileset dir="${build.dir.hive}/kryo/classes" includes="**/*.class"/>
+ <fileset dir="${build.dir.hive}/commons-lang/classes" includes="**/StringUtils.class,**/WordUtils.class"/>
<fileset dir="${build.dir.hive}/json/classes" includes="**/*.class"/>
<fileset dir="${build.dir.hive}/avro/classes" includes="**/*.class"/>
<fileset dir="${build.dir.hive}/avro-mapred/classes" includes="**/*.class"/>
<fileset dir="${build.dir.hive}/shims/classes" includes="**/*.class"/>
<fileset dir="${build.dir.hive}/javaewah/classes" includes="**/*.class"/>
<fileset dir="${build.dir.hive}/javolution/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/protobuf-java/classes"
- includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/snappy/classes"
- includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/jackson-core-asl/classes"
- includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/jackson-mapper-asl/classes"
- includes="**/*.class"/>
+ <fileset dir="${build.dir.hive}/protobuf-java/classes" includes="**/*.class"/>
+ <fileset dir="${build.dir.hive}/snappy/classes" includes="**/*.class"/>
+ <fileset dir="${build.dir.hive}/jackson-core-asl/classes" includes="**/*.class"/>
+ <fileset dir="${build.dir.hive}/jackson-mapper-asl/classes" includes="**/*.class"/>
+ <fileset dir="${build.dir.hive}/guava/classes" includes="**/*.class"/>
<manifest>
<!-- Not putting these in their own manifest section, since that inserts
a new-line, which breaks the reading of the attributes. -->
Modified: hive/branches/vectorization/ql/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/ivy.xml?rev=1522098&r1=1522097&r2=1522098&view=diff
==============================================================================
--- hive/branches/vectorization/ql/ivy.xml (original)
+++ hive/branches/vectorization/ql/ivy.xml Thu Sep 12 01:21:10 2013
@@ -46,8 +46,9 @@
rev="${protobuf.version}" transitive="false"/>
<dependency org="org.iq80.snappy" name="snappy"
rev="${snappy.version}" transitive="false"/>
+ <dependency org="com.esotericsoftware.kryo" name="kryo"
+ rev="${kryo.version}" />
- <!-- hadoop specific guava -->
<dependency org="org.json" name="json" rev="${json.version}"/>
<dependency org="commons-collections" name="commons-collections" rev="${commons-collections.version}"/>
<dependency org="commons-configuration" name="commons-configuration" rev="${commons-configuration.version}"
@@ -80,6 +81,8 @@
<exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
</dependency>
+ <dependency org="com.google.guava" name="guava" rev="${guava.version}" transitive="false"/>
+
<!-- Test Dependencies -->
<dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" />