diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml
index 36996977f3..7d5c3f4ea1 100644
--- a/druid-handler/pom.xml
+++ b/druid-handler/pom.xml
@@ -29,7 +29,7 @@
..
- 28.1-jre
+ 16.0.1
diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml
index f9ed3cbb77..493abbb301 100644
--- a/hcatalog/core/pom.xml
+++ b/hcatalog/core/pom.xml
@@ -45,6 +45,16 @@
hive-cli
${project.version}
+
+ org.apache.hive
+ hive-common
+ ${project.version}
+
+
+ org.apache.hive
+ hive-metastore
+ ${project.version}
+
org.apache.hive
hive-exec
@@ -72,6 +82,11 @@
test
+
+ com.google.guava
+ guava
+ ${guava.version}
+
com.fasterxml.jackson.core
jackson-annotations
diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatContext.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatContext.java
index 27af5624d3..883fd95b5e 100644
--- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatContext.java
+++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatContext.java
@@ -19,8 +19,8 @@
package org.apache.hive.hcatalog.common;
-import org.apache.hive.com.google.common.base.Optional;
-import org.apache.hive.com.google.common.base.Preconditions;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.common.classification.InterfaceAudience;
import org.apache.hadoop.hive.common.classification.InterfaceStability;
diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java
index 72e99f4e79..e851d2a6f4 100644
--- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java
+++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HCatUtil.java
@@ -35,7 +35,7 @@
import javax.security.auth.login.LoginException;
-import org.apache.hive.com.google.common.collect.Maps;
+import com.google.common.collect.Maps;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java
index a289f5782c..e18dae983b 100644
--- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java
+++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java
@@ -47,11 +47,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.hive.com.google.common.cache.Cache;
-import org.apache.hive.com.google.common.cache.CacheBuilder;
-import org.apache.hive.com.google.common.cache.RemovalListener;
-import org.apache.hive.com.google.common.cache.RemovalNotification;
-import org.apache.hive.com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.RemovalListener;
+import com.google.common.cache.RemovalNotification;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
/**
* A thread safe time expired cache for HiveMetaStoreClient
diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/HCatRecordObjectInspectorFactory.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/HCatRecordObjectInspectorFactory.java
index 79215fe949..c35168122c 100644
--- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/HCatRecordObjectInspectorFactory.java
+++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/HCatRecordObjectInspectorFactory.java
@@ -22,8 +22,8 @@
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.apache.hive.com.google.common.cache.Cache;
-import org.apache.hive.com.google.common.cache.CacheBuilder;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java
index 153a62080c..a7befa9f0d 100644
--- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java
+++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java
@@ -22,7 +22,7 @@
import java.io.IOException;
import java.util.Properties;
-import org.apache.hive.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatTableInfo.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatTableInfo.java
index a46c5411d7..0ba23e7500 100644
--- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatTableInfo.java
+++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatTableInfo.java
@@ -23,7 +23,7 @@
import java.io.Serializable;
import java.util.List;
-import org.apache.hive.com.google.common.collect.Lists;
+import com.google.common.collect.Lists;
import org.apache.hadoop.hive.metastore.Warehouse;
import org.apache.hadoop.hive.metastore.api.Table;
import org.apache.hive.hcatalog.common.HCatUtil;
diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/SpecialCases.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/SpecialCases.java
index 05012361ce..5c40d54083 100644
--- a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/SpecialCases.java
+++ b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/SpecialCases.java
@@ -42,7 +42,7 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.hive.com.google.common.collect.Maps;
+import com.google.common.collect.Maps;
/**
* This class is a place to put all the code associated with
diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/common/TestHCatUtil.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/common/TestHCatUtil.java
index e24d7afea4..5a45635882 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/common/TestHCatUtil.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/common/TestHCatUtil.java
@@ -25,8 +25,8 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.hive.com.google.common.collect.Lists;
-import org.apache.hive.com.google.common.collect.Maps;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.permission.FsAction;
diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java
index 6c4be26944..983a66a52c 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java
@@ -19,7 +19,7 @@
package org.apache.hive.hcatalog.mapreduce;
-import org.apache.hive.com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSet;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatOutputFormat.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatOutputFormat.java
index 4c68e5f8c1..416a01e277 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatOutputFormat.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatOutputFormat.java
@@ -25,7 +25,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.hive.com.google.common.collect.Lists;
+import com.google.common.collect.Lists;
import org.apache.hadoop.conf.Configuration;
diff --git a/itests/qtest-druid/pom.xml b/itests/qtest-druid/pom.xml
index 61b5235f02..05692c7a6c 100644
--- a/itests/qtest-druid/pom.xml
+++ b/itests/qtest-druid/pom.xml
@@ -41,7 +41,7 @@
1.19.3
9.4.10.v20180503
10.11.1.1
- 28.1-jre
+ 16.0.1
4.1.0
2.0.0
1.7.25
diff --git a/llap-common/src/java/org/apache/hadoop/hive/llap/AsyncPbRpcProxy.java b/llap-common/src/java/org/apache/hadoop/hive/llap/AsyncPbRpcProxy.java
index a9ab1f6ee4..ad39963614 100644
--- a/llap-common/src/java/org/apache/hadoop/hive/llap/AsyncPbRpcProxy.java
+++ b/llap-common/src/java/org/apache/hadoop/hive/llap/AsyncPbRpcProxy.java
@@ -171,7 +171,7 @@ public void shutdown() {
CallableRequest request, LlapNodeId nodeId) {
ListenableFuture future = executor.submit(request);
Futures.addCallback(future, new ResponseCallback(
- request.getCallback(), nodeId, this), MoreExecutors.directExecutor());
+ request.getCallback(), nodeId, this));
}
@VisibleForTesting
@@ -283,7 +283,7 @@ public void onFailure(Throwable t) {
LOG.warn("RequestManager shutdown with error", t);
}
}
- }, MoreExecutors.directExecutor());
+ });
}
@Override
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java
index a49920eeac..088a5f33c0 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java
@@ -174,7 +174,7 @@ public void onFailure(Throwable t) {
Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), t);
}
}
- }, MoreExecutors.directExecutor());
+ });
// TODO: why is this needed? we could just save the host and port?
nodeId = LlapNodeId.getInstance(localAddress.get().getHostName(), localAddress.get().getPort());
LOG.info("AMReporter running with DaemonId: {}, NodeId: {}", daemonId, nodeId);
@@ -274,7 +274,7 @@ public void onFailure(Throwable t) {
LOG.warn("Failed to send taskKilled for {}. The attempt will likely time out.",
taskAttemptId);
}
- }, MoreExecutors.directExecutor());
+ });
}
public void queryComplete(QueryIdentifier queryIdentifier) {
@@ -342,7 +342,7 @@ public void onFailure(Throwable t) {
amNodeInfo.amNodeId, currentQueryIdentifier, t);
queryFailedHandler.queryFailed(currentQueryIdentifier);
}
- }, MoreExecutors.directExecutor());
+ });
}
}
} catch (InterruptedException e) {
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java
index 848c42a750..33ade55ee1 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java
@@ -128,7 +128,7 @@ public synchronized void registerTask(RuntimeTask task,
sendCounterInterval, maxEventsToGet, requestCounter, containerIdStr, initialEvent,
fragmentRequestId, wmCounters);
ListenableFuture future = heartbeatExecutor.submit(currentCallable);
- Futures.addCallback(future, new HeartbeatCallback(errorReporter), MoreExecutors.directExecutor());
+ Futures.addCallback(future, new HeartbeatCallback(errorReporter));
}
/**
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java
index 15468e3e08..93b59dcb4e 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java
@@ -186,7 +186,7 @@ public TaskExecutorService(int numExecutors, int waitQueueSize,
executionCompletionExecutorService = MoreExecutors.listeningDecorator(
executionCompletionExecutorServiceRaw);
ListenableFuture> future = waitQueueExecutorService.submit(new WaitQueueWorker());
- Futures.addCallback(future, new WaitQueueWorkerCallback(), MoreExecutors.directExecutor());
+ Futures.addCallback(future, new WaitQueueWorkerCallback());
}
/**
diff --git a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java
index f04272a5a7..2ecb7a2830 100644
--- a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java
+++ b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java
@@ -799,17 +799,15 @@ public void run() {
}, 0, 10000L, TimeUnit.MILLISECONDS);
nodeEnablerFuture = nodeEnabledExecutor.submit(nodeEnablerCallable);
- Futures.addCallback(nodeEnablerFuture, new LoggingFutureCallback("NodeEnablerThread", LOG),
- MoreExecutors.directExecutor());
+ Futures.addCallback(nodeEnablerFuture, new LoggingFutureCallback("NodeEnablerThread", LOG));
delayedTaskSchedulerFuture =
delayedTaskSchedulerExecutor.submit(delayedTaskSchedulerCallable);
Futures.addCallback(delayedTaskSchedulerFuture,
- new LoggingFutureCallback("DelayedTaskSchedulerThread", LOG), MoreExecutors.directExecutor());
+ new LoggingFutureCallback("DelayedTaskSchedulerThread", LOG));
schedulerFuture = schedulerExecutor.submit(schedulerCallable);
- Futures.addCallback(schedulerFuture, new LoggingFutureCallback("SchedulerThread", LOG),
- MoreExecutors.directExecutor());
+ Futures.addCallback(schedulerFuture, new LoggingFutureCallback("SchedulerThread", LOG));
registry.start();
registry.registerStateChangeListener(new NodeStateChangeListener());
diff --git a/pom.xml b/pom.xml
index b8840e009f..ba87106c6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@
0.1.2
0.14.0-incubating
1.2.0-3f79e055
- 28.1-jre
+ 19.0
2.4.11
1.3.166
3.1.0
diff --git a/ql/pom.xml b/ql/pom.xml
index 7116a27a93..e5eed46947 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -1023,8 +1023,8 @@
org.apache.hive.com.zaxxer.hikari
- com.google.common
- org.apache.hive.com.google.common
+ com.google.guava
+ org.apache.hive.com.google.guava
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/WorkloadManager.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/WorkloadManager.java
index 671db101d0..37c3714017 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/WorkloadManager.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/WorkloadManager.java
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.hive.ql.exec.tez;
-import com.google.common.util.concurrent.*;
import org.apache.hadoop.hive.metastore.api.WMPoolSchedulingPolicy;
import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils;
@@ -25,6 +24,11 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.common.math.DoubleMath;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.io.IOException;
import java.util.ArrayList;
@@ -1098,7 +1102,7 @@ private static int transferSessionsToDestroy(Collection source,
}
private void failOnFutureFailure(ListenableFuture> future) {
- Futures.addCallback(future, FATAL_ERROR_CALLBACK, MoreExecutors.directExecutor());
+ Futures.addCallback(future, FATAL_ERROR_CALLBACK);
}
private void queueGetRequestOnMasterThread(
@@ -1932,7 +1936,7 @@ public SessionInitContext(SettableFuture future,
public void start() throws Exception {
ListenableFuture getFuture = tezAmPool.getSessionAsync();
- Futures.addCallback(getFuture, this, MoreExecutors.directExecutor());
+ Futures.addCallback(getFuture, this);
}
@Override
@@ -1986,7 +1990,7 @@ public void onSuccess(WmTezSession session) {
case GETTING: {
ListenableFuture waitFuture = session.waitForAmRegistryAsync(
amRegistryTimeoutMs, timeoutPool);
- Futures.addCallback(waitFuture, this, MoreExecutors.directExecutor());
+ Futures.addCallback(waitFuture, this);
break;
}
case WAITING_FOR_REGISTRY: {
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/SampleTezSessionState.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/SampleTezSessionState.java
index 34030af78e..f5ab981f26 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/SampleTezSessionState.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/SampleTezSessionState.java
@@ -19,8 +19,10 @@
package org.apache.hadoop.hive.ql.exec.tez;
-import com.google.common.util.concurrent.*;
-
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
import java.io.IOException;
import java.util.concurrent.ScheduledExecutorService;
import javax.security.auth.login.LoginException;
@@ -126,7 +128,7 @@ public void onSuccess(Boolean result) {
public void onFailure(Throwable t) {
future.setException(t);
}
- }, MoreExecutors.directExecutor());
+ });
return future;
}
diff --git a/standalone-metastore/metastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java b/standalone-metastore/metastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java
index 7dafcfbae3..101d6759c5 100644
--- a/standalone-metastore/metastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java
+++ b/standalone-metastore/metastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java
@@ -451,9 +451,9 @@ Partition build() {
HostAndPort hp = HostAndPort.fromString(host)
.withDefaultPort(port);
- LOG.info("Connecting to {}:{}", hp.getHost(), hp.getPort());
+ LOG.info("Connecting to {}:{}", hp.getHostText(), hp.getPort());
- return new URI(THRIFT_SCHEMA, null, hp.getHost(), hp.getPort(),
+ return new URI(THRIFT_SCHEMA, null, hp.getHostText(), hp.getPort(),
null, null, null);
}
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index 2e1c0dc269..0b974ed25c 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -81,7 +81,7 @@
0.1.2
3.1.0
- 28.1-jre
+ 19.0
3.1.0
2.6.1
2.9.9