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/08/18 00:26:26 UTC
[hive] branch branch-2 updated: HIVE-23980: Shade Guava from
hive-exec in Hive branch-2 (Liang-Chi, reviewed by Chao Sun) (#1397)
This is an automated email from the ASF dual-hosted git repository.
sunchao pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 8ee71e5 HIVE-23980: Shade Guava from hive-exec in Hive branch-2 (Liang-Chi, reviewed by Chao Sun) (#1397)
8ee71e5 is described below
commit 8ee71e51b558d4b26b78585bce8af1caf4283b75
Author: Liang-Chi Hsieh <vi...@gmail.com>
AuthorDate: Mon Aug 17 17:25:44 2020 -0700
HIVE-23980: Shade Guava from hive-exec in Hive branch-2 (Liang-Chi, reviewed by Chao Sun) (#1397)
---
.../src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java | 4 ++--
ql/pom.xml | 12 ++++++++++--
ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java | 7 +++----
3 files changed, 15 insertions(+), 8 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/ql/pom.xml b/ql/pom.xml
index 00ac4c2..c63fe12 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -850,8 +850,8 @@
<include>org.apache.hive:hive-metastore</include>
<include>org.apache.hive:hive-service-rpc</include>
<include>com.esotericsoftware:kryo-shaded</include>
- <include>com.esotericsoftware:minlog</include>
- <include>org.objenesis:objenesis</include>
+ <include>com.esotericsoftware:minlog</include>
+ <include>org.objenesis:objenesis</include>
<include>org.apache.parquet:parquet-hadoop-bundle</include>
<include>org.apache.thrift:libthrift</include>
<include>org.apache.thrift:libfb303</include>
@@ -889,6 +889,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);
}