You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by su...@apache.org on 2020/12/01 20:20:13 UTC
[hive] branch branch-2.3 updated: HIVE-23980: Shade Guava from
hive-exec in Hive 2.3 (#1356)
This is an automated email from the ASF dual-hosted git repository.
sunchao pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-2.3 by this push:
new 2b3d4c9 HIVE-23980: Shade Guava from hive-exec in Hive 2.3 (#1356)
2b3d4c9 is described below
commit 2b3d4c921a5185cf546f7642aae55394d3f7b13b
Author: Liang-Chi Hsieh <vi...@gmail.com>
AuthorDate: Tue Dec 1 12:19:52 2020 -0800
HIVE-23980: Shade Guava from hive-exec in Hive 2.3 (#1356)
---
.../org/apache/hadoop/hive/ql/log/PerfLogger.java | 4 +--
itests/hive-blobstore/pom.xml | 10 +++---
itests/hive-unit/pom.xml | 18 +++++-----
itests/qtest-accumulo/pom.xml | 38 +++++++++-------------
itests/qtest-spark/pom.xml | 18 ++++++----
ql/pom.xml | 10 ++++++
.../org/apache/hadoop/hive/ql/QueryDisplay.java | 7 ++--
7 files changed, 57 insertions(+), 48 deletions(-)
diff --git a/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java b/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java
index 7f3c8b3..fcca7f4 100644
--- a/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java
+++ b/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java
@@ -207,11 +207,11 @@ public class PerfLogger {
}
- public ImmutableMap<String, Long> getStartTimes() {
+ public Map<String, Long> getStartTimes() {
return ImmutableMap.copyOf(startTimes);
}
- public ImmutableMap<String, Long> getEndTimes() {
+ public Map<String, Long> getEndTimes() {
return ImmutableMap.copyOf(endTimes);
}
diff --git a/itests/hive-blobstore/pom.xml b/itests/hive-blobstore/pom.xml
index 3cbecb2..cb754bc 100644
--- a/itests/hive-blobstore/pom.xml
+++ b/itests/hive-blobstore/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
+ <artifactId>hive-exec</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -63,25 +63,25 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
<version>${project.version}</version>
- <classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-it-unit</artifactId>
+ <artifactId>hive-metastore</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
+ <artifactId>hive-it-unit</artifactId>
<version>${project.version}</version>
+ <classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
+ <artifactId>hive-serde</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml
index e335788..3192460 100644
--- a/itests/hive-unit/pom.xml
+++ b/itests/hive-unit/pom.xml
@@ -41,17 +41,23 @@
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-jdbc</artifactId>
+ <artifactId>hive-exec</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-service</artifactId>
+ <artifactId>hive-exec</artifactId>
<version>${project.version}</version>
+ <classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
+ <artifactId>hive-jdbc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-service</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -156,12 +162,6 @@
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
<artifactId>hive-common</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml
index b34aa7d..562a904 100644
--- a/itests/qtest-accumulo/pom.xml
+++ b/itests/qtest-accumulo/pom.xml
@@ -56,63 +56,57 @@
<artifactId>hive-contrib</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
+ <artifactId>hive-exec</artifactId>
<version>${project.version}</version>
<scope>test</scope>
+ <classifier>core</classifier>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
+ <artifactId>hive-exec</artifactId>
<version>${project.version}</version>
- <classifier>tests</classifier>
<scope>test</scope>
+ <classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-it-custom-serde</artifactId>
+ <artifactId>hive-metastore</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-it-util</artifactId>
+ <artifactId>hive-metastore</artifactId>
<version>${project.version}</version>
+ <classifier>tests</classifier>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
+ <artifactId>hive-it-custom-serde</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
+ <artifactId>hive-it-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- <classifier>core</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
+ <artifactId>hive-serde</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- <classifier>tests</classifier>
</dependency>
<!-- inter-project -->
<dependency>
diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml
index 2033a64..9f44bd8 100644
--- a/itests/qtest-spark/pom.xml
+++ b/itests/qtest-spark/pom.xml
@@ -116,7 +116,7 @@
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
+ <artifactId>hive-exec</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -124,30 +124,36 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
<version>${project.version}</version>
- <classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-it-custom-serde</artifactId>
+ <artifactId>hive-metastore</artifactId>
<version>${project.version}</version>
+ <classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-it-util</artifactId>
+ <artifactId>hive-it-custom-serde</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
+ <artifactId>hive-it-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
+ <artifactId>hive-serde</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/ql/pom.xml b/ql/pom.xml
index 9d54480..5c8cd4b 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -878,6 +878,8 @@
<include>org.apache.orc:orc-core</include>
<include>org.apache.orc:orc-tools</include>
<include>joda-time:joda-time</include>
+ <include>org.apache.calcite:*</include>
+ <include>org.apache.calcite.avatica:avatica</include>
</includes>
</artifactSet>
<relocations>
@@ -889,6 +891,14 @@
<pattern>org.objenesis</pattern>
<shadedPattern>org.apache.hive.org.objenesis</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>com.google.common</pattern>
+ <shadedPattern>org.apache.hive.com.google.common</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.thirdparty.publicsuffix</pattern>
+ <shadedPattern>org.apache.hive.com.google.thirdparty.publicsuffix</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</execution>
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java b/ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java
index bf6cb91..1f2e4c9 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.hive.ql;
-import com.google.common.collect.ImmutableMap;
import org.apache.hadoop.hive.ql.exec.Task;
import org.apache.hadoop.hive.ql.exec.TaskResult;
import org.apache.hadoop.hive.ql.plan.api.StageType;
@@ -226,7 +225,7 @@ public class QueryDisplay {
* @param phase phase of query
* @param hmsTimings map of HMS Client method-calls and duration in miliseconds, during given phase.
*/
- public synchronized void setHmsTimings(Phase phase, ImmutableMap<String, Long> hmsTimings) {
+ public synchronized void setHmsTimings(Phase phase, Map<String, Long> hmsTimings) {
hmsTimingMap.put(phase, hmsTimings);
}
@@ -242,7 +241,7 @@ public class QueryDisplay {
* @param phase phase of query
* @param perfLogStarts map of PerfLogger call-trace name and start time in miliseconds, during given phase.
*/
- public synchronized void setPerfLogStarts(Phase phase, ImmutableMap<String, Long> perfLogStarts) {
+ public synchronized void setPerfLogStarts(Phase phase, Map<String, Long> perfLogStarts) {
perfLogStartMap.put(phase, perfLogStarts);
}
@@ -258,7 +257,7 @@ public class QueryDisplay {
* @param phase phase of query
* @param perfLogEnds map of PerfLogger call-trace name and end time in miliseconds, during given phase.
*/
- public synchronized void setPerfLogEnds(Phase phase, ImmutableMap<String, Long> perfLogEnds) {
+ public synchronized void setPerfLogEnds(Phase phase, Map<String, Long> perfLogEnds) {
perfLogEndMap.put(phase, perfLogEnds);
}