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();