polish code

Author: ruanwenjun

externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/ExecuteStatement.scala

@@ -130,7 +130,7 @@ class ExecuteStatement(
         dialect.cancelStatement(jdbcStatement)
         jdbcStatement = null
       } else {
-        warn(s"The cancel operation $statementId might be ignore due to jdbcStatement is null.")
+        warn(s"Ignore cancel operation $statementId due to jdbcStatement is null.")
       }
     }
   }

externals/kyuubi-jdbc-engine/src/test/scala/org/apache/kyuubi/engine/jdbc/mysql/OperationWithEngineSuite.scala

@@ -83,29 +83,30 @@ class OperationWithEngineSuite extends MySQLOperationSuite with HiveJDBCTestHelp
   test("MySQL - JDBC ExecuteStatement cancel operation should kill SQL statement") {
     failAfter(20.seconds) {
       withSessionHandle { (client, handle) =>
-        val tExecuteStatementReq = new TExecuteStatementReq()
-        tExecuteStatementReq.setSessionHandle(handle)
+        val executeReq = new TExecuteStatementReq()
+        executeReq.setSessionHandle(handle)
         // The SQL will sleep 120s
-        tExecuteStatementReq.setStatement("SELECT sleep(120)")
-        tExecuteStatementReq.setRunAsync(true)
-        val executeResp = client.ExecuteStatement(tExecuteStatementReq)
+        executeReq.setStatement("SELECT sleep(120)")
+        executeReq.setRunAsync(true)
+        val executeResp = client.ExecuteStatement(executeReq)
         assert(executeResp.getStatus.getStatusCode === TStatusCode.SUCCESS_STATUS)
 
-        assertOperationStatusIn(
+        val operationHandle = executeResp.getOperationHandle
+
+        waitForOperationStatusIn(
           client,
-          executeResp.getOperationHandle,
+          operationHandle,
           Set(RUNNING_STATE),
-          5)
+          timeoutMs = 5000)
 
-        val cancelResp =
-          client.CancelOperation(new TCancelOperationReq(executeResp.getOperationHandle))
+        val cancelResp = client.CancelOperation(new TCancelOperationReq(operationHandle))
         assert(cancelResp.getStatus.getStatusCode === TStatusCode.SUCCESS_STATUS)
 
-        assertOperationStatusIn(
+        waitForOperationStatusIn(
           client,
-          executeResp.getOperationHandle,
+          operationHandle,
           Set(CANCELED_STATE),
-          5)
+          timeoutMs = 5000)
       }
     }
   }

externals/kyuubi-jdbc-engine/src/test/scala/org/apache/kyuubi/engine/jdbc/starrocks/StarRocksOperationWithEngineSuite.scala

@@ -90,22 +90,24 @@ class StarRocksOperationWithEngineSuite extends StarRocksOperationSuite with Hiv
         executeReq.setStatement("SELECT sleep(120)")
         executeReq.setRunAsync(true)
         val executeResp = client.ExecuteStatement(executeReq)
+        assert(executeResp.getStatus.getStatusCode === TStatusCode.SUCCESS_STATUS)
 
-        assertOperationStatusIn(
+        val operationHandle = executeResp.getOperationHandle
+
+        waitForOperationStatusIn(
           client,
-          executeResp.getOperationHandle,
+          operationHandle,
           Set(RUNNING_STATE),
-          5)
+          timeoutMs = 5000)
 
-        val cancelResp =
-          client.CancelOperation(new TCancelOperationReq(executeResp.getOperationHandle))
+        val cancelResp = client.CancelOperation(new TCancelOperationReq(operationHandle))
         assert(cancelResp.getStatus.getStatusCode === TStatusCode.SUCCESS_STATUS)
 
-        assertOperationStatusIn(
+        waitForOperationStatusIn(
           client,
-          executeResp.getOperationHandle,
+          operationHandle,
           Set(CANCELED_STATE),
-          5)
+          timeoutMs = 5000)
       }
     }
   }

kyuubi-common/src/test/scala/org/apache/kyuubi/operation/HiveJDBCTestHelper.scala

@@ -124,7 +124,7 @@ trait HiveJDBCTestHelper extends JDBCTestHelper {
   }
 
   def waitForOperationToComplete(client: Iface, op: TOperationHandle): Unit = {
-    assertOperationStatusIn(
+    waitForOperationStatusIn(
       client,
       op,
       Set(
@@ -134,15 +134,15 @@ trait HiveJDBCTestHelper extends JDBCTestHelper {
         ERROR_STATE,
         UKNOWN_STATE,
         TIMEDOUT_STATE),
-      90)
+      timeoutMs = 90000)
   }
 
-  def assertOperationStatusIn(
+  def waitForOperationStatusIn(
       client: Iface,
       op: TOperationHandle,
       status: Set[TOperationState],
-      timeoutInSeconds: Int): Unit = {
-    eventually(timeout(timeoutInSeconds.seconds), interval(100.milliseconds)) {
+      timeoutMs: Int): Unit = {
+    eventually(timeout(timeoutMs.milliseconds), interval(100.milliseconds)) {
       val state = client.GetOperationStatus(new TGetOperationStatusReq(op)).getOperationState
       assert(status.contains(state))
     }