You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by iw...@apache.org on 2020/05/13 15:22:05 UTC
[bigtop] branch master updated: BIGTOP-3348. Fix Hive test failures
caused by NoSuchMethodError of ApplicationId.fromString. (#636)
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 9b66904 BIGTOP-3348. Fix Hive test failures caused by NoSuchMethodError of ApplicationId.fromString. (#636)
9b66904 is described below
commit 9b66904274239c058833e792565823ca3152cf96
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Thu May 14 00:21:55 2020 +0900
BIGTOP-3348. Fix Hive test failures caused by NoSuchMethodError of ApplicationId.fromString. (#636)
---
.../hive/patch4-HIVE-16402-hadoop-2.10.0.diff | 251 +++++++++++++++++++++
1 file changed, 251 insertions(+)
diff --git a/bigtop-packages/src/common/hive/patch4-HIVE-16402-hadoop-2.10.0.diff b/bigtop-packages/src/common/hive/patch4-HIVE-16402-hadoop-2.10.0.diff
new file mode 100644
index 0000000..c2069ee
--- /dev/null
+++ b/bigtop-packages/src/common/hive/patch4-HIVE-16402-hadoop-2.10.0.diff
@@ -0,0 +1,251 @@
+diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml
+index 0cfa07f704..d1513746fe 100644
+--- a/hcatalog/core/pom.xml
++++ b/hcatalog/core/pom.xml
+@@ -191,7 +191,7 @@
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+- </dependency>
++ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+@@ -208,13 +208,19 @@
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+- </dependency>
++ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-tests</artifactId>
+ <version>${hadoop.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
++ <exclusions>
++ <exclusion>
++ <groupId>org.slf4j</groupId>
++ <artifactId>slf4j-log4j12</artifactId>
++ </exclusion>
++ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+diff --git a/llap-server/pom.xml b/llap-server/pom.xml
+index 8f70bd7d39..b10f05f82b 100644
+--- a/llap-server/pom.xml
++++ b/llap-server/pom.xml
+@@ -177,6 +177,10 @@
+ <artifactId>slider-core</artifactId>
+ <version>${slider.version}</version>
+ <exclusions>
++ <exclusion>
++ <groupId>asm</groupId>
++ <artifactId>asm</artifactId>
++ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+@@ -222,8 +226,8 @@
+ <artifactId>jettison</artifactId>
+ </exclusion>
+ <exclusion>
+- <groupId>asm</groupId>
+- <artifactId>asm</artifactId>
++ <groupId>org.slf4j</groupId>
++ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+diff --git a/metastore/pom.xml b/metastore/pom.xml
+index a50bbbc2fd..733f8912f3 100644
+--- a/metastore/pom.xml
++++ b/metastore/pom.xml
+@@ -141,6 +141,22 @@
+ <artifactId>antlr-runtime</artifactId>
+ <version>${antlr.version}</version>
+ </dependency>
++ <dependency>
++ <groupId>org.apache.hadoop</groupId>
++ <artifactId>hadoop-auth</artifactId>
++ <version>${hadoop.version}</version>
++ <optional>true</optional>
++ <exclusions>
++ <exclusion>
++ <groupId>org.slf4j</groupId>
++ <artifactId>slf4j-log4j12</artifactId>
++ </exclusion>
++ <exclusion>
++ <groupId>commmons-logging</groupId>
++ <artifactId>commons-logging</artifactId>
++ </exclusion>
++ </exclusions>
++ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+diff --git a/pom.xml b/pom.xml
+index a73fac0200..a7c462e70e 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -141,7 +141,7 @@
+ <guava.version>14.0.1</guava.version>
+ <groovy.version>2.4.4</groovy.version>
+ <h2database.version>1.3.166</h2database.version>
+- <hadoop.version>2.7.2</hadoop.version>
++ <hadoop.version>2.10.0</hadoop.version>
+ <hadoop.bin.path>${basedir}/${hive.path.to.root}/testutils/hadoop</hadoop.bin.path>
+ <hamcrest.version>1.1</hamcrest.version>
+ <hbase.version>1.1.1</hbase.version>
+@@ -684,13 +684,24 @@
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+- </dependency>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.hadoop</groupId>
++ <artifactId>hadoop-auth</artifactId>
++ <version>${hadoop.version}</version>
++ <exclusions>
++ <exclusion>
++ <groupId>commmons-logging</groupId>
++ <artifactId>commons-logging</artifactId>
++ </exclusion>
++ </exclusions>
++ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+- <exclusion>
++ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+@@ -730,7 +741,7 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+- <artifactId>hadoop-mapreduce-client-core</artifactId>
++ <artifactId>hadoop-mapreduce-client-common</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+@@ -743,11 +754,56 @@
+ </exclusion>
+ </exclusions>
+ </dependency>
++ <dependency>
++ <groupId>org.apache.hadoop</groupId>
++ <artifactId>hadoop-mapreduce-client-core</artifactId>
++ <version>${hadoop.version}</version>
++ <exclusions>
++ <exclusion>
++ <groupId>org.slf4j</groupId>
++ <artifactId>slf4j-log4j12</artifactId>
++ </exclusion>
++ <exclusion>
++ <groupId>commmons-logging</groupId>
++ <artifactId>commons-logging</artifactId>
++ </exclusion>
++ </exclusions>
++ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minikdc</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
++ <dependency>
++ <groupId>org.apache.hadoop</groupId>
++ <artifactId>hadoop-yarn-api</artifactId>
++ <version>${hadoop.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.hadoop</groupId>
++ <artifactId>hadoop-yarn-client</artifactId>
++ <version>${hadoop.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.hadoop</groupId>
++ <artifactId>hadoop-yarn-common</artifactId>
++ <version>${hadoop.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.hadoop</groupId>
++ <artifactId>hadoop-yarn-registry</artifactId>
++ <version>${hadoop.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.hadoop</groupId>
++ <artifactId>hadoop-yarn-server-web-common</artifactId>
++ <version>${hadoop.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.hadoop</groupId>
++ <artifactId>hadoop-yarn-server-web-proxy</artifactId>
++ <version>${hadoop.version}</version>
++ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
+index 03012df373..580da46277 100644
+--- a/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
++++ b/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
+@@ -77,7 +77,7 @@ PREHOOK: query: ALTER TABLE default.encrypted_table RENAME TO encrypted_db.encry
+ PREHOOK: type: ALTERTABLE_RENAME
+ PREHOOK: Input: default@encrypted_table
+ PREHOOK: Output: default@encrypted_table
+-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Unable to alter table. Alter Table operation for default.encrypted_table failed to move data due to: '/build/ql/test/data/warehouse/encrypted_table can't be moved from encryption zone /build/ql/test/data/warehouse/encrypted_table to encryption zone /build/ql/test/data/warehouse/encrypted_db.db.' See hive log file for details.
++FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Unable to alter table. Alter Table operation for default.encrypted_table failed to move data due to: '/build/ql/test/data/warehouse/encrypted_table can't be moved into an encryption zone.' See hive log file for details.
+ PREHOOK: query: SHOW TABLES
+ PREHOOK: type: SHOWTABLES
+ PREHOOK: Input: database:default
+diff --git a/shims/0.23/pom.xml b/shims/0.23/pom.xml
+index f4b580e841..7c586fab98 100644
+--- a/shims/0.23/pom.xml
++++ b/shims/0.23/pom.xml
+@@ -179,6 +179,10 @@
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
++ <exclusion>
++ <groupId>org.slf4j</groupId>
++ <artifactId>slf4j-log4j12</artifactId>
++ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+diff --git a/shims/scheduler/pom.xml b/shims/scheduler/pom.xml
+index 2e868b046f..0eadb69435 100644
+--- a/shims/scheduler/pom.xml
++++ b/shims/scheduler/pom.xml
+@@ -76,6 +76,12 @@
+ <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+ <version>${hadoop.version}</version>
+ <optional>true</optional>
++ <exclusions>
++ <exclusion>
++ <groupId>org.slf4j</groupId>
++ <artifactId>slf4j-log4j12</artifactId>
++ </exclusion>
++ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+diff --git a/storage-api/pom.xml b/storage-api/pom.xml
+index e21bbb6d00..d0bf08813e 100644
+--- a/storage-api/pom.xml
++++ b/storage-api/pom.xml
+@@ -32,7 +32,7 @@
+ <properties>
+ <commons-lang.version>2.6</commons-lang.version>
+ <guava.version>14.0.1</guava.version>
+- <hadoop.version>2.7.2</hadoop.version>
++ <hadoop.version>2.10.0</hadoop.version>
+ <junit.version>4.11</junit.version>
+ <slf4j.version>1.7.10</slf4j.version>
+ </properties>