You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2013/11/28 19:32:25 UTC
svn commit: r1546440 - in /hive/trunk: ./ beeline/ cli/ common/ contrib/
hbase-handler/ hcatalog/ hwi/ itests/ itests/custom-serde/
itests/hcatalog-unit/ itests/qtest/ itests/test-serde/ itests/util/ jdbc/
metastore/ ql/ serde/ service/
Author: brock
Date: Thu Nov 28 18:32:24 2013
New Revision: 1546440
URL: http://svn.apache.org/r1546440
Log:
HIVE-5755 - Fix hadoop2 execution environment Milestone 1 (Vikram Dixit K via Brock Noland)
Modified:
hive/trunk/beeline/pom.xml
hive/trunk/cli/pom.xml
hive/trunk/common/pom.xml
hive/trunk/contrib/pom.xml
hive/trunk/hbase-handler/pom.xml
hive/trunk/hcatalog/pom.xml
hive/trunk/hwi/pom.xml
hive/trunk/itests/custom-serde/pom.xml
hive/trunk/itests/hcatalog-unit/pom.xml
hive/trunk/itests/pom.xml
hive/trunk/itests/qtest/pom.xml
hive/trunk/itests/test-serde/pom.xml
hive/trunk/itests/util/pom.xml
hive/trunk/jdbc/pom.xml
hive/trunk/metastore/pom.xml
hive/trunk/pom.xml
hive/trunk/ql/pom.xml
hive/trunk/serde/pom.xml
hive/trunk/service/pom.xml
Modified: hive/trunk/beeline/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/beeline/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/beeline/pom.xml (original)
+++ hive/trunk/beeline/pom.xml Thu Nov 28 18:32:24 2013
@@ -113,9 +113,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/cli/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/cli/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/cli/pom.xml (original)
+++ hive/trunk/cli/pom.xml Thu Nov 28 18:32:24 2013
@@ -114,9 +114,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/common/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/common/pom.xml (original)
+++ hive/trunk/common/pom.xml Thu Nov 28 18:32:24 2013
@@ -77,9 +77,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/contrib/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/contrib/pom.xml (original)
+++ hive/trunk/contrib/pom.xml Thu Nov 28 18:32:24 2013
@@ -72,9 +72,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/hbase-handler/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/hbase-handler/pom.xml (original)
+++ hive/trunk/hbase-handler/pom.xml Thu Nov 28 18:32:24 2013
@@ -87,9 +87,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/hcatalog/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/hcatalog/pom.xml (original)
+++ hive/trunk/hcatalog/pom.xml Thu Nov 28 18:32:24 2013
@@ -49,9 +49,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/hwi/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hwi/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/hwi/pom.xml (original)
+++ hive/trunk/hwi/pom.xml Thu Nov 28 18:32:24 2013
@@ -96,9 +96,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<!-- dependencies are always listed in sorted order by groupId, artifectId -->
<dependency>
Modified: hive/trunk/itests/custom-serde/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/itests/custom-serde/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/itests/custom-serde/pom.xml (original)
+++ hive/trunk/itests/custom-serde/pom.xml Thu Nov 28 18:32:24 2013
@@ -44,9 +44,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/itests/hcatalog-unit/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/itests/hcatalog-unit/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/itests/hcatalog-unit/pom.xml (original)
+++ hive/trunk/itests/hcatalog-unit/pom.xml Thu Nov 28 18:32:24 2013
@@ -108,9 +108,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<!-- test -->
<dependency>
Modified: hive/trunk/itests/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/itests/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/itests/pom.xml (original)
+++ hive/trunk/itests/pom.xml Thu Nov 28 18:32:24 2013
@@ -33,7 +33,6 @@
<modules>
<module>custom-serde</module>
- <module>hive-unit</module>
<module>hcatalog-unit</module>
<module>util</module>
<module>test-serde</module>
Modified: hive/trunk/itests/qtest/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/itests/qtest/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/itests/qtest/pom.xml (original)
+++ hive/trunk/itests/qtest/pom.xml Thu Nov 28 18:32:24 2013
@@ -118,9 +118,6 @@
</profile>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<properties>
<active.hadoop.version>${hadoop-20S.version}</active.hadoop.version>
<test.dfs.mkdir>-mkdir</test.dfs.mkdir>
@@ -206,6 +203,12 @@
</properties>
<dependencies>
<dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>${jersey.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop-23.version}</version>
@@ -213,6 +216,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop-23.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop-23.version}</version>
<classifier>tests</classifier>
@@ -220,6 +230,12 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop-23.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
<version>${hadoop-23.version}</version>
<classifier>tests</classifier>
@@ -227,11 +243,24 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-hs</artifactId>
+ <version>${hadoop-23.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<version>${hadoop-23.version}</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-tests</artifactId>
+ <version>${hadoop-23.version}</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
<version>${hbase.hadoop2.version}</version>
@@ -280,6 +309,12 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>${hbase.hadoop2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <version>${hbase.hadoop2.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Modified: hive/trunk/itests/test-serde/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/itests/test-serde/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/itests/test-serde/pom.xml (original)
+++ hive/trunk/itests/test-serde/pom.xml Thu Nov 28 18:32:24 2013
@@ -45,9 +45,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/itests/util/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/itests/util/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/itests/util/pom.xml (original)
+++ hive/trunk/itests/util/pom.xml Thu Nov 28 18:32:24 2013
@@ -71,9 +71,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/jdbc/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/jdbc/pom.xml (original)
+++ hive/trunk/jdbc/pom.xml Thu Nov 28 18:32:24 2013
@@ -85,9 +85,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/metastore/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/metastore/pom.xml (original)
+++ hive/trunk/metastore/pom.xml Thu Nov 28 18:32:24 2013
@@ -130,9 +130,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/pom.xml (original)
+++ hive/trunk/pom.xml Thu Nov 28 18:32:24 2013
@@ -690,7 +690,7 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<reuseForks>false</reuseForks>
<failIfNoTests>false</failIfNoTests>
- <argLine></argLine>
+ <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${test.tmp.dir}/conf</additionalClasspathElement>
<additionalClasspathElement>${basedir}/${hive.path.to.root}/conf</additionalClasspathElement>
Modified: hive/trunk/ql/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/ql/pom.xml (original)
+++ hive/trunk/ql/pom.xml Thu Nov 28 18:32:24 2013
@@ -221,9 +221,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hive/trunk/serde/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/serde/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/serde/pom.xml (original)
+++ hive/trunk/serde/pom.xml Thu Nov 28 18:32:24 2013
@@ -88,9 +88,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -117,6 +114,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop-23.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<version>${hadoop-23.version}</version>
<optional>true</optional>
Modified: hive/trunk/service/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/service/pom.xml?rev=1546440&r1=1546439&r2=1546440&view=diff
==============================================================================
--- hive/trunk/service/pom.xml (original)
+++ hive/trunk/service/pom.xml Thu Nov 28 18:32:24 2013
@@ -106,9 +106,6 @@
<profiles>
<profile>
<id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>