From d313fa89b0307fcbace445fe5e9c6950ecf199ef Mon Sep 17 00:00:00 2001
From: wenyh1 <2365151147@qq.com>
Date: Tue, 31 Oct 2023 18:03:06 +0800
Subject: [PATCH] [inner-2371] fix: sql execution hang problem caused by the
 inability to respond to the front side due to unprocessed packets.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit dcff228b4c13bf0fd9f7bb0d52f9c18aaba36b59、07c0c1f1c986a71fb74d0fcc0379965592c63b49)
---
 .../java/com/actiontech/dble/services/BackendService.java | 8 ++++----
 .../dble/services/mysqlsharding/MySQLResponseService.java | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/actiontech/dble/services/BackendService.java b/src/main/java/com/actiontech/dble/services/BackendService.java
index 6879f5924..bf3207688 100644
--- a/src/main/java/com/actiontech/dble/services/BackendService.java
+++ b/src/main/java/com/actiontech/dble/services/BackendService.java
@@ -131,7 +131,7 @@ public abstract class BackendService extends AbstractService {
             handleDataError(e);
         } finally {
             isHandling.set(false);
-            if (taskQueue.size() > 0) {
+            if (!taskQueue.isEmpty()) {
                 doHandle(task);
             }
         }
@@ -232,7 +232,7 @@ public abstract class BackendService extends AbstractService {
     protected void handleDataError(Exception e) {
         LOGGER.warn(this.toString() + " handle data error:", e);
         connection.close("handle data error:" + e.getMessage());
-        while (taskQueue.size() > 0) {
+        while (!taskQueue.isEmpty()) {
             clearTaskQueue();
             readSize.set(0);
             // clear all data from the client
@@ -674,8 +674,8 @@ public abstract class BackendService extends AbstractService {
                 handleDataError(e);
             } finally {
                 isHandling.set(false);
-                if (taskQueue.size() > 0) {
-                    doHandle(null);
+                if (!taskQueue.isEmpty()) {
+                    doHandle(taskQueue.peek());
                 }
             }
         }
diff --git a/src/main/java/com/actiontech/dble/services/mysqlsharding/MySQLResponseService.java b/src/main/java/com/actiontech/dble/services/mysqlsharding/MySQLResponseService.java
index 9ce063064..18fc345b8 100644
--- a/src/main/java/com/actiontech/dble/services/mysqlsharding/MySQLResponseService.java
+++ b/src/main/java/com/actiontech/dble/services/mysqlsharding/MySQLResponseService.java
@@ -528,7 +528,7 @@ public class MySQLResponseService extends BackendService {
     @Override
     protected Executor getExecutor() {
         Executor executor;
-        if (complexQuery) {
+        if (complexQuery || SystemConfig.getInstance().getUsePerformanceMode() == 1) {
             executor = DbleServer.getInstance().getComplexQueryExecutor();
         } else {
             executor = DbleServer.getInstance().getBackendExecutor();