2

xinyiZzz · Oct 12, 2024 · e1c7029 · e1c7029
1 parent c10f528
commit e1c7029
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlConnectProcessor.java b/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlConnectProcessor.java
@@ -177,6 +177,7 @@ public Schema fetchArrowFlightSchema(int timeoutMs) {
     @Override
     public void close() throws Exception {
         ctx.setCommand(MysqlCommand.COM_SLEEP);
+        ctx.clear();
         // TODO support query profile
         for (StmtExecutor asynExecutor : returnResultFromRemoteExecutor) {
             asynExecutor.finalizeQuery();

diff --git a/.../src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSqlConnectContext.java b/.../src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSqlConnectContext.java
@@ -63,6 +63,7 @@ protected void closeChannel() {
         if (flightSqlChannel != null) {
             flightSqlChannel.close();
         }
+        connectScheduler.unregisterConnection(this);
     }
 
     // kill operation with no protect.
@@ -72,8 +73,8 @@ public void kill(boolean killConnection) {
 
         if (killConnection) {
             isKilled = true;
+            // Close channel and break connection with client.
             closeChannel();
-            connectScheduler.unregisterConnection(this);
         }
         // Now, cancel running query.
         cancelQuery(new Status(TStatusCode.CANCELLED, "arrow flight query killed by user"));