Revert "HIVE-27560: [2.3] Enhancing compatibility with Guava (apache#…

…4542)" This reverts commit 9c2aee4.
charlso96 · Sep 7, 2023 · 84dc988 · 84dc988
1 parent ca4d8c3
commit 84dc988
Show file tree

Hide file tree

Showing 32 changed files with 37 additions and 1,010 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,9 +18,9 @@
 
 package org.apache.hadoop.hive.common;
 
-import org.apache.hadoop.metrics2.MetricsInfo;
+import com.google.common.base.Objects;
 
-import org.apache.hive.common.guava.Objects;
+import org.apache.hadoop.metrics2.MetricsInfo;
 
 /**
  * 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,6 +19,7 @@
 
 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;
@@ -28,7 +29,6 @@
 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;