From 9107a300eaccdbf69a61bc2ac2328437eb63edd8 Mon Sep 17 00:00:00 2001
From: liupeiyue <liupeiyue@yy.com>
Date: Mon, 16 Dec 2024 15:08:13 +0800
Subject: [PATCH] [KYUUBI #6843] FIX 'query-timeout-thread' thread leak
---
.../kyuubi/engine/flink/operation/PlanOnlyStatement.scala | 3 +--
.../scala/org/apache/kyuubi/operation/ExecuteStatement.scala | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/operation/PlanOnlyStatement.scala b/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/operation/PlanOnlyStatement.scala
index 276aafb2314..1284bfd73e6 100644
--- a/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/operation/PlanOnlyStatement.scala
+++ b/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/operation/PlanOnlyStatement.scala
@@ -67,8 +67,7 @@ class PlanOnlyStatement(
statement)
resultSet =
ResultSetUtil.fromResultFetcher(resultFetcher, resultMaxRows, resultFetchTimeout);
- case _ =>
- explainOperation(statement)
+ case _ => explainOperation(statement)
}
} catch {
onError()
diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/ExecuteStatement.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/ExecuteStatement.scala
index 46ca2e8f6c0..02c22e4f6a7 100644
--- a/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/ExecuteStatement.scala
+++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/ExecuteStatement.scala
@@ -172,9 +172,7 @@ class ExecuteStatement(
try {
val opHandle = sessionManager.submitBackgroundOperation(asyncOperation)
setBackgroundHandle(opHandle)
- } catch {
- onError("submitting query in background, query rejected")
- }
+ } catch onError("submitting query in background, query rejected")
if (!shouldRunAsync) getBackgroundHandle.get()
}