This is an automated email from the ASF dual-hosted git repository. dongjoon pushed a commit to branch branch-2.4 in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-2.4 by this push: new fa1b476 [SPARK-33333][BUILD][2.4] Upgrade Jetty to 9.4.28.v20200408 fa1b476 is described below commit fa1b476072495371152a8d9af136eeb5cd4f2b53 Author: Dongjoon Hyun <dh...@apple.com> AuthorDate: Fri Nov 6 08:32:22 2020 -0800 [SPARK-33333][BUILD][2.4] Upgrade Jetty to 9.4.28.v20200408 ### What changes were proposed in this pull request? This PR aims to upgrade Jetty to 9.4.28.v20200408 like `master` branch (Apache Spark 3.1). This includes a subset of https://github.com/apache/spark/commit/722369ee5532c94eb7dd0cbda3b7365fc2f52026. ### Why are the changes needed? To bring the bug fixes. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass the CIs. Closes #30276 from dongjoon-hyun/SPARK-33333-2. Authored-by: Dongjoon Hyun <dh...@apple.com> Signed-off-by: Dongjoon Hyun <dh...@apple.com> --- dev/deps/spark-deps-hadoop-3.1 | 4 ++-- pom.xml | 2 +- .../java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-3.1 b/dev/deps/spark-deps-hadoop-3.1 index 5d03346..01b6224 100644 --- a/dev/deps/spark-deps-hadoop-3.1 +++ b/dev/deps/spark-deps-hadoop-3.1 @@ -116,8 +116,8 @@ jersey-container-servlet/2.22.2//jersey-container-servlet-2.22.2.jar jersey-guava/2.22.2//jersey-guava-2.22.2.jar jersey-media-jaxb/2.22.2//jersey-media-jaxb-2.22.2.jar jersey-server/2.22.2//jersey-server-2.22.2.jar -jetty-webapp/9.3.27.v20190418//jetty-webapp-9.3.27.v20190418.jar -jetty-xml/9.3.27.v20190418//jetty-xml-9.3.27.v20190418.jar +jetty-webapp/9.4.28.v20200408//jetty-webapp-9.4.28.v20200408.jar +jetty-xml/9.4.28.v20200408//jetty-xml-9.4.28.v20200408.jar jline/2.14.6//jline-2.14.6.jar joda-time/2.9.3//joda-time-2.9.3.jar jodd-core/3.5.2//jodd-core-3.5.2.jar diff --git a/pom.xml b/pom.xml index 4961e2a..ab2dd91 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ <orc.version>1.5.5</orc.version> <orc.classifier>nohive</orc.classifier> <hive.parquet.version>1.6.0</hive.parquet.version> - <jetty.version>9.3.27.v20190418</jetty.version> + <jetty.version>9.4.28.v20200408</jetty.version> <javaxservlet.version>3.1.0</javaxservlet.version> <chill.version>0.9.3</chill.version> <ivy.version>2.4.0</ivy.version> diff --git a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java index 341a7fd..a10245b 100644 --- a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java +++ b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java @@ -19,7 +19,6 @@ package org.apache.hive.service.cli.thrift; import java.util.Arrays; -import java.util.concurrent.ExecutorService; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -65,7 +64,7 @@ public class ThriftHttpCLIService extends ThriftCLIService { // Server thread pool // Start with minWorkerThreads, expand till maxWorkerThreads and reject subsequent requests String threadPoolName = "HiveServer2-HttpHandler-Pool"; - ExecutorService executorService = new ThreadPoolExecutor(minWorkerThreads, maxWorkerThreads, + ThreadPoolExecutor executorService = new ThreadPoolExecutor(minWorkerThreads, maxWorkerThreads, workerKeepAliveTime, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), new ThreadFactoryWithGarbageCleanup(threadPoolName)); ExecutorThreadPool threadPool = new ExecutorThreadPool(executorService); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org