fix(console): improve cancellation

Author: Zxc4wonder

backend/framework/src/main/java/org/jumpserver/chen/framework/console/QueryConsole.java

@@ -617,7 +617,7 @@ public void onCancel() {
         this.getState().setExecutionStatus(EXECUTION_STATUS_CANCELLED);
         try {
             var plan = this.currentPlan;
-            if (plan != null && plan.getStatement() != null) {
+            if (plan != null) {
                 plan.cancel();
                 this.getConsoleLogger().error("cancel query: %s", plan.getTargetSQL());
             }
@@ -893,15 +893,13 @@ private DataView runSingleSQL(String sql, ACLResult aclResult) throws SQLExcepti
                     .createPlan(SQL.of(sourceSQL));
             plan.setAclResult(aclResult);
             plan.setSqlQueryParams(sqlQueryParams);
-            plan.generateTargetSQL();
-            this.getConsoleLogger().info("execute sql: %s", plan.getTargetSQL());
-
             this.currentPlan = plan;
-
             this.getState().setCanCancel(true);
             this.stateManager.commit();
 
             try {
+                plan.generateTargetSQL();
+                this.getConsoleLogger().info("execute sql: %s", plan.getTargetSQL());
                 var result = plan.executeWithAudit();
                 this.getConsoleLogger().success(result);
                 return result;

backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/sql/SQLExecutePlan.java

@@ -27,6 +27,7 @@ public class SQLExecutePlan {
     private String targetSQL;
     private final DbType druidDbType;
     private volatile Statement statement;
+    private volatile boolean cancelled;
     private Connection connection;
     private ACLResult aclResult;
 
@@ -85,7 +86,10 @@ public SQLQueryResult executeWithAudit() throws SQLException {
     }
 
 
-    public Statement createStatement() throws SQLException {
+    public synchronized Statement createStatement() throws SQLException {
+        if (this.cancelled) {
+            throw new SQLException(MessageUtils.get("ExecutionCanceled"));
+        }
         if (this.statement == null || this.statement.isClosed()) {
             this.statement = this.connection.createStatement();
         }
@@ -97,7 +101,14 @@ public SQLStatement getTargetSQLStatement() {
     }
 
     public void cancel() throws SQLException {
-        this.statement.cancel();
+        Statement currentStatement;
+        synchronized (this) {
+            this.cancelled = true;
+            currentStatement = this.statement;
+        }
+        if (currentStatement != null && !currentStatement.isClosed()) {
+            currentStatement.cancel();
+        }
     }
 
     public void close() {