From 53e4e6cce1d36bba461af2edfc9ae04043984ee3 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Sat, 19 Jul 2025 02:50:45 +0800 Subject: [PATCH 1/6] Use Kyuubi Signal --- kyuubi-common/pom.xml | 5 ++++ .../apache/kyuubi/util/SignalRegister.scala | 10 ++++---- kyuubi-hive-beeline/pom.xml | 5 ++++ .../apache/hive/beeline/SunSignalHandler.java | 4 ++-- pom.xml | 23 ++++++++----------- 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/kyuubi-common/pom.xml b/kyuubi-common/pom.xml index cb592948df0..29a98ab7ff9 100644 --- a/kyuubi-common/pom.xml +++ b/kyuubi-common/pom.xml @@ -108,6 +108,11 @@ kyuubi-relocated-hive-service-rpc + + org.apache.kyuubi + kyuubi-relocated-util + + com.fasterxml.jackson.module jackson-module-scala_${scala.binary.version} diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/util/SignalRegister.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/util/SignalRegister.scala index bff962f694c..00294e9a21e 100644 --- a/kyuubi-common/src/main/scala/org/apache/kyuubi/util/SignalRegister.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/util/SignalRegister.scala @@ -17,18 +17,20 @@ package org.apache.kyuubi.util +import java.util import java.util.Collections import scala.collection.JavaConverters._ +import scala.collection.mutable import org.apache.commons.lang3.SystemUtils import org.slf4j.Logger -import sun.misc.{Signal, SignalHandler} import org.apache.kyuubi.Logging +import org.apache.kyuubi.shaded.util.{Signal, SignalHandler} object SignalRegister extends Logging { - private val handlers = new scala.collection.mutable.HashMap[String, ActionHandler] + private val handlers = new mutable.HashMap[String, ActionHandler] def registerLogger(log: Logger): Unit = { Seq("TERM", "HUP", "INT").foreach { sig => @@ -41,7 +43,7 @@ object SignalRegister extends Logging { ActionHandler(signal) }) handler.register({ - log.error(s"RECEIVED SIGNAL ${signal.getNumber}: " + sig) + log.error(s"RECEIVED SIGNAL ${signal.getNumber}: $sig") false }) } catch { @@ -52,7 +54,7 @@ object SignalRegister extends Logging { } case class ActionHandler(signal: Signal) extends SignalHandler { - private val actions = Collections.synchronizedList(new java.util.LinkedList[() => Boolean]) + private val actions = Collections.synchronizedList(new util.LinkedList[() => Boolean]) private val prevHandler: SignalHandler = Signal.handle(signal, this) override def handle(sig: Signal): Unit = { diff --git a/kyuubi-hive-beeline/pom.xml b/kyuubi-hive-beeline/pom.xml index dafae95099c..32a602d6cb6 100644 --- a/kyuubi-hive-beeline/pom.xml +++ b/kyuubi-hive-beeline/pom.xml @@ -46,6 +46,11 @@ ${project.version} + + org.apache.kyuubi + kyuubi-relocated-util + + org.apache.hadoop hadoop-client-api diff --git a/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/SunSignalHandler.java b/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/SunSignalHandler.java index db4fc5b9e6f..382d55709b0 100644 --- a/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/SunSignalHandler.java +++ b/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/SunSignalHandler.java @@ -24,8 +24,8 @@ import java.sql.SQLException; import java.sql.Statement; -import sun.misc.Signal; -import sun.misc.SignalHandler; +import org.apache.kyuubi.shaded.util.Signal; +import org.apache.kyuubi.shaded.util.SignalHandler; public class SunSignalHandler implements BeeLineSignalHandler, SignalHandler { private Statement stmt = null; diff --git a/pom.xml b/pom.xml index 70bedda8a30..33a03d86739 100644 --- a/pom.xml +++ b/pom.xml @@ -115,8 +115,9 @@ 8 3.9.10 - ${java.version} - ${java.version} + 8 + 8 + 8 2.12.19 2.12 2.12.0 @@ -174,7 +175,7 @@ 4.13.2 3.5.2 6.13.5 - 0.5.0 + 0.6.0-SNAPSHOT kyuubi-relocated-zookeeper-34 6.0.5 2.24.3 @@ -310,6 +311,11 @@ kyuubi-relocated-hive-service-rpc ${kyuubi-relocated.version} + + org.apache.kyuubi + kyuubi-relocated-util + ${kyuubi-relocated.version} + org.apache.kyuubi ${kyuubi-relocated-zookeeper.artifacts} @@ -1951,10 +1957,6 @@ 11 - - - ${java.version} - ${java.version} @@ -1965,10 +1967,6 @@ 17 - - - ${java.version} - ${java.version} @@ -1979,9 +1977,6 @@ 21 - - - ${java.version} From 08eba76956f3c6a429ee692b0769a6171cd5d513 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Mon, 21 Jul 2025 12:49:44 +0800 Subject: [PATCH 2/6] RC --- pom.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 33a03d86739..6c448ce1c9e 100644 --- a/pom.xml +++ b/pom.xml @@ -175,7 +175,7 @@ 4.13.2 3.5.2 6.13.5 - 0.6.0-SNAPSHOT + 0.6.0 kyuubi-relocated-zookeeper-34 6.0.5 2.24.3 @@ -1299,6 +1299,18 @@ Maven Repository https://repo.maven.apache.org/maven2 + + + + true + + + false + + shaded-staging + Kyuubi Shaded 0.6.0 RC + https://repository.apache.org/content/repositories/orgapachekyuubi-1059/ + From 12eeae3abedd470b49ccb260cf046e8220a35dc6 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Mon, 21 Jul 2025 14:24:30 +0800 Subject: [PATCH 3/6] fix --- pom.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c448ce1c9e..40227b30d2d 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,6 @@ 3.9.10 8 8 - 8 2.12.19 2.12 2.12.0 @@ -1962,6 +1961,16 @@ + + jdk9+ + + [9,) + + + 8 + + + java-11 From b699c345aadf44a09eb68b41182f6667e4a1561a Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Thu, 24 Jul 2025 13:49:42 +0800 Subject: [PATCH 4/6] remove staging repo --- pom.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pom.xml b/pom.xml index 40227b30d2d..c50981283f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1298,18 +1298,6 @@ Maven Repository https://repo.maven.apache.org/maven2 - - - - true - - - false - - shaded-staging - Kyuubi Shaded 0.6.0 RC - https://repository.apache.org/content/repositories/orgapachekyuubi-1059/ - From 2eb2635730e1dfd9ba17fc71c96cdde54909fb44 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Thu, 24 Jul 2025 14:43:07 +0800 Subject: [PATCH 5/6] cleanup --- pom.xml | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index c50981283f8..a53096f42e6 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,6 @@ - 8 3.9.10 8 8 @@ -1896,7 +1895,8 @@ - ${java.version} + ${maven.compiler.target} + provided test From 64804060a545ed576ef3be1b07f0c553c47fc2ba Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Mon, 28 Jul 2025 11:39:29 +0800 Subject: [PATCH 6/6] enforcer.maxJdkVersion --- pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a53096f42e6..8bdcc291cbf 100644 --- a/pom.xml +++ b/pom.xml @@ -116,6 +116,7 @@ 3.9.10 8 8 + 8 2.12.19 2.12 2.12.0 @@ -1895,7 +1896,7 @@ - ${maven.compiler.target} + ${enforcer.maxJdkVersion} provided test @@ -2046,6 +2047,7 @@ extensions/spark/kyuubi-spark-connector-hive + 17 4.0.0 4.0 4.13.1 @@ -2066,6 +2068,7 @@ spark-master + 17 4.0.0-SNAPSHOT 4.13.1 org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.PySparkTest