This is an automated email from the ASF dual-hosted git repository. yikaifei pushed a commit to branch rename-close-session in repository https://gitbox.apache.org/repos/asf/kyuubi.git
commit 32765873a78a95a34729184b8dfafde65337cb41 Author: yikaifei <[email protected]> AuthorDate: Thu May 9 10:48:29 2024 +0800 rename closeSession --- .../org/apache/kyuubi/engine/chat/session/ChatSessionManager.scala | 6 +++--- .../apache/kyuubi/engine/flink/session/FlinkSQLSessionManager.scala | 6 +++--- .../org/apache/kyuubi/engine/hive/session/HiveSessionManager.scala | 2 +- .../org/apache/kyuubi/engine/jdbc/session/JdbcSessionManager.scala | 6 +++--- .../apache/kyuubi/engine/spark/session/SparkSQLSessionManager.scala | 6 +++--- .../apache/kyuubi/engine/trino/session/TrinoSessionManager.scala | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/externals/kyuubi-chat-engine/src/main/scala/org/apache/kyuubi/engine/chat/session/ChatSessionManager.scala b/externals/kyuubi-chat-engine/src/main/scala/org/apache/kyuubi/engine/chat/session/ChatSessionManager.scala index ff5c4748e..69e194e09 100644 --- a/externals/kyuubi-chat-engine/src/main/scala/org/apache/kyuubi/engine/chat/session/ChatSessionManager.scala +++ b/externals/kyuubi-chat-engine/src/main/scala/org/apache/kyuubi/engine/chat/session/ChatSessionManager.scala @@ -59,12 +59,12 @@ class ChatSessionManager(name: String) override def closeSession(sessionHandle: SessionHandle): Unit = { super.closeSession(sessionHandle) if (conf.get(ENGINE_SHARE_LEVEL) == ShareLevel.CONNECTION.toString) { - info("Session stopped due to shared level is Connection.") - stopSession() + info("Chat engine stopped due to session stopped and shared level is Connection.") + stopEngine() } } - private def stopSession(): Unit = { + private def stopEngine(): Unit = { ChatEngine.currentEngine.foreach(_.stop()) } } diff --git a/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/session/FlinkSQLSessionManager.scala b/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/session/FlinkSQLSessionManager.scala index 2a72029d4..a11ceca35 100644 --- a/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/session/FlinkSQLSessionManager.scala +++ b/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/session/FlinkSQLSessionManager.scala @@ -90,12 +90,12 @@ class FlinkSQLSessionManager(engineContext: DefaultContext) warn(s"Error closing session $sessionHandle", t) } if (shareLevel == ShareLevel.CONNECTION) { - info("Session stopped due to shared level is Connection.") - stopSession() + info("Flink engine stopped due to session stopped and shared level is Connection.") + stopEngine() } } - private def stopSession(): Unit = { + private def stopEngine(): Unit = { FlinkSQLEngine.currentEngine.foreach(_.stop()) } diff --git a/externals/kyuubi-hive-sql-engine/src/main/scala/org/apache/kyuubi/engine/hive/session/HiveSessionManager.scala b/externals/kyuubi-hive-sql-engine/src/main/scala/org/apache/kyuubi/engine/hive/session/HiveSessionManager.scala index ef98f5b0a..7f0ff2b58 100644 --- a/externals/kyuubi-hive-sql-engine/src/main/scala/org/apache/kyuubi/engine/hive/session/HiveSessionManager.scala +++ b/externals/kyuubi-hive-sql-engine/src/main/scala/org/apache/kyuubi/engine/hive/session/HiveSessionManager.scala @@ -172,7 +172,7 @@ class HiveSessionManager(engine: HiveSQLEngine) extends SessionManager("HiveSess override def closeSession(sessionHandle: SessionHandle): Unit = { super.closeSession(sessionHandle) if (conf.get(ENGINE_SHARE_LEVEL) == ShareLevel.CONNECTION.toString) { - info("Session stopped due to shared level is Connection.") + info("Hive engine stopped due to session stopped and shared level is Connection.") engine.stop() } } diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/session/JdbcSessionManager.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/session/JdbcSessionManager.scala index 101a06e71..4119823c3 100644 --- a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/session/JdbcSessionManager.scala +++ b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/session/JdbcSessionManager.scala @@ -55,12 +55,12 @@ class JdbcSessionManager(name: String) override def closeSession(sessionHandle: SessionHandle): Unit = { super.closeSession(sessionHandle) if (conf.get(ENGINE_SHARE_LEVEL) == ShareLevel.CONNECTION.toString) { - info("Session stopped due to shared level is Connection.") - stopSession() + info("JDBC engine stopped due to session stopped and shared level is Connection.") + stopEngine() } } - private def stopSession(): Unit = { + private def stopEngine(): Unit = { JdbcSQLEngine.currentEngine.foreach { engine => engine.selfExited = true engine.stop() diff --git a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/session/SparkSQLSessionManager.scala b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/session/SparkSQLSessionManager.scala index b6768c697..7c033d891 100644 --- a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/session/SparkSQLSessionManager.scala +++ b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/session/SparkSQLSessionManager.scala @@ -200,12 +200,12 @@ class SparkSQLSessionManager private (name: String, spark: SparkSession) } } if (shareLevel == ShareLevel.CONNECTION) { - info("Session stopped due to shared level is Connection.") - stopSession() + info("Spark engine stopped due to session stopped and shared level is Connection.") + stopEngine() } } - private def stopSession(): Unit = { + private def stopEngine(): Unit = { SparkSQLEngine.currentEngine.foreach(_.stop()) } diff --git a/externals/kyuubi-trino-engine/src/main/scala/org/apache/kyuubi/engine/trino/session/TrinoSessionManager.scala b/externals/kyuubi-trino-engine/src/main/scala/org/apache/kyuubi/engine/trino/session/TrinoSessionManager.scala index 55aa2f3fa..8514fbf63 100644 --- a/externals/kyuubi-trino-engine/src/main/scala/org/apache/kyuubi/engine/trino/session/TrinoSessionManager.scala +++ b/externals/kyuubi-trino-engine/src/main/scala/org/apache/kyuubi/engine/trino/session/TrinoSessionManager.scala @@ -45,12 +45,12 @@ class TrinoSessionManager override def closeSession(sessionHandle: SessionHandle): Unit = { super.closeSession(sessionHandle) if (conf.get(ENGINE_SHARE_LEVEL) == ShareLevel.CONNECTION.toString) { - info("Session stopped due to shared level is Connection.") - stopSession() + info("Trino engine stopped due to session stopped and shared level is Connection.") + stopEngine() } } - private def stopSession(): Unit = { + private def stopEngine(): Unit = { TrinoSqlEngine.currentEngine.foreach(_.stop()) }
