Revert "HIVE-23980: Shade Guava from hive-exec in Hive branch-2 (Liang-Chi, reviewed by Chao Sun) (#1397)"
This reverts commit 8ee71e51b558d4b26b78585bce8af1caf4283b75. Seems it is causing some unit test failures.
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 fcca7f4..7f3c8b3 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 Long getDuration(String method) {
}
- public Map<String, Long> getStartTimes() {
+ public ImmutableMap<String, Long> getStartTimes() {
return ImmutableMap.copyOf(startTimes);
}
- public Map<String, Long> getEndTimes() {
+ public ImmutableMap<String, Long> getEndTimes() {
return ImmutableMap.copyOf(endTimes);
}
diff --git a/ql/pom.xml b/ql/pom.xml
index c63fe12..00ac4c2 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,14 +889,6 @@
<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 1f2e4c9..bf6cb91 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java
@@ -17,6 +17,7 @@
*/
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;
@@ -225,7 +226,7 @@ public synchronized Map<String, Long> getHmsTimings(Phase phase) {
* @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, Map<String, Long> hmsTimings) {
+ public synchronized void setHmsTimings(Phase phase, ImmutableMap<String, Long> hmsTimings) {
hmsTimingMap.put(phase, hmsTimings);
}
@@ -241,7 +242,7 @@ public synchronized Map<String, Long> getPerfLogStarts(Phase phase) {
* @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, Map<String, Long> perfLogStarts) {
+ public synchronized void setPerfLogStarts(Phase phase, ImmutableMap<String, Long> perfLogStarts) {
perfLogStartMap.put(phase, perfLogStarts);
}
@@ -257,7 +258,7 @@ public synchronized Map<String, Long> getPerfLogEnds(Phase phase) {
* @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, Map<String, Long> perfLogEnds) {
+ public synchronized void setPerfLogEnds(Phase phase, ImmutableMap<String, Long> perfLogEnds) {
perfLogEndMap.put(phase, perfLogEnds);
}
