HIVE-27560: [2.3] Enhancing compatibility with Guava (#4542)

apache · Aug 17, 2023 · 9c2aee4 · 9c2aee4
1 parent 2469d9e
commit 9c2aee4
Show file tree

Hide file tree

Showing 32 changed files with 1,010 additions and 37 deletions.
diff --git a/common/src/java/org/apache/hadoop/hive/common/JvmMetricsInfo.java b/common/src/java/org/apache/hadoop/hive/common/JvmMetricsInfo.java
@@ -18,10 +18,10 @@
 
 package org.apache.hadoop.hive.common;
 
-import com.google.common.base.Objects;
-
 import org.apache.hadoop.metrics2.MetricsInfo;
 
+import org.apache.hive.common.guava.Objects;
+
 /**
  * JVM and logging related metrics info instances. Ported from Hadoop JvmMetricsInfo.
  */

diff --git a/common/src/java/org/apache/hadoop/hive/common/JvmPauseMonitor.java b/common/src/java/org/apache/hadoop/hive/common/JvmPauseMonitor.java
@@ -19,7 +19,6 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -29,6 +28,7 @@
 import org.apache.hadoop.hive.common.metrics.common.MetricsConstant;
 import org.apache.hadoop.hive.common.metrics.common.MetricsFactory;
 import org.apache.hadoop.util.Daemon;
+import org.apache.hive.common.guava.Stopwatch;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;