Skip to content

HIVE-21961: Upgrade Hadoop to 3.1.4, Guava to 27.0-jre and Jetty to 9.4.20.v20190813 #1813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wangyum wants to merge 1 commit into from
Closed

HIVE-21961: Upgrade Hadoop to 3.1.4, Guava to 27.0-jre and Jetty to 9.4.20.v20190813 #1813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@
<dropwizard-metrics-hadoop-metrics2-reporter.version>0.1.2</dropwizard-metrics-hadoop-metrics2-reporter.version>
<druid.version>0.17.1</druid.version>
<flatbuffers.version>1.6.0.1</flatbuffers.version>
<guava.version>19.0</guava.version>
<guava.version>27.0-jre</guava.version>
<groovy.version>2.4.11</groovy.version>
<h2database.version>1.3.166</h2database.version>
<hadoop.version>3.1.0</hadoop.version>
<hadoop.version>3.1.4</hadoop.version>
<hadoop.bin.path>${basedir}/${hive.path.to.root}/testutils/hadoop</hadoop.bin.path>
<hamcrest.version>1.3</hamcrest.version>
<hbase.version>2.0.0-alpha4</hbase.version>
Expand All @@ -157,7 +157,7 @@
<javax-servlet-jsp.version>2.3.1</javax-servlet-jsp.version>
<javolution.version>5.5.1</javolution.version>
<jettison.version>1.1</jettison.version>
<jetty.version>9.3.27.v20190418</jetty.version>
<jetty.version>9.4.20.v20190813</jetty.version>
<jersey.version>1.19</jersey.version>
<!-- Glassfish jersey is included for Spark client test only -->
<glassfish.jersey.version>2.22.2</glassfish.jersey.version>
Expand Down
6 changes: 2 additions & 4 deletions service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import java.security.KeyStore;
import java.util.Arrays;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -89,11 +88,10 @@ protected void initServer() {
// Start with minWorkerThreads, expand till maxWorkerThreads and reject
// subsequent requests
String threadPoolName = "HiveServer2-HttpHandler-Pool";
ExecutorService executorService = new ThreadPoolExecutorWithOomHook(minWorkerThreads,
ThreadPoolExecutor threadPoolExecutorWithOomHook = new ThreadPoolExecutorWithOomHook(minWorkerThreads,
maxWorkerThreads,workerKeepAliveTime, TimeUnit.SECONDS,
new SynchronousQueue<Runnable>(), new ThreadFactoryWithGarbageCleanup(threadPoolName), oomHook);

ExecutorThreadPool threadPool = new ExecutorThreadPool((ThreadPoolExecutor) executorService);
ExecutorThreadPool threadPool = new ExecutorThreadPool(threadPoolExecutorWithOomHook);

// HTTP Server
server = new Server(threadPool);
Expand Down
4 changes: 2 additions & 2 deletions ...tastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,9 +549,9 @@ public static List<FieldSchema> createSchema(@Nullable List<String> params) {
HostAndPort hp = HostAndPort.fromString(host)
.withDefaultPort(port);

LOG.info("Connecting to {}:{}", hp.getHostText(), hp.getPort());
LOG.info("Connecting to {}:{}", hp.getHost(), hp.getPort());
Copy link
Member Author

@wangyum wangyum Dec 31, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/google/guava/blob/v27.0/guava/src/com/google/common/net/HostAndPort.java#L91-L95


return new URI(THRIFT_SCHEMA, null, hp.getHostText(), hp.getPort(),
return new URI(THRIFT_SCHEMA, null, hp.getHost(), hp.getPort(),
null, null, null);
}

Expand Down
4 changes: 2 additions & 2 deletions standalone-metastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
<dropwizard-metrics-hadoop-metrics2-reporter.version>0.1.2
</dropwizard-metrics-hadoop-metrics2-reporter.version>
<dropwizard.version>3.1.0</dropwizard.version>
<guava.version>19.0</guava.version>
<hadoop.version>3.1.0</hadoop.version>
<guava.version>27.0-jre</guava.version>
<hadoop.version>3.1.4</hadoop.version>
<hikaricp.version>2.6.1</hikaricp.version>
<jackson.version>2.10.5</jackson.version>
<javolution.version>5.5.1</javolution.version>
Expand Down
4 changes: 2 additions & 2 deletions storage-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<commons-logging.version>1.1.3</commons-logging.version>
<guava.version>19.0</guava.version>
<hadoop.version>3.1.0</hadoop.version>
<guava.version>27.0-jre</guava.version>
<hadoop.version>3.1.4</hadoop.version>
<junit.version>4.13</junit.version>
<junit.jupiter.version>5.6.3</junit.jupiter.version>
<junit.vintage.version>5.6.3</junit.vintage.version>
Expand Down