[kylin] 06/37: KYLIN-5557 Add response message for the request of canceling the asynchronous query

[xxyu]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 134ddb0e3087f74b00fbf5fe2e8f7d4937431861
Author: Jiawei Li <1019037...@qq.com>
AuthorDate: Tue Mar 14 14:41:10 2023 +0800

    KYLIN-5557 Add response message for the request of canceling the 
asynchronous query
---
 .../src/main/java/org/apache/kylin/common/msg/CnMessage.java  | 11 +++++++++++
 .../src/main/java/org/apache/kylin/common/msg/Message.java    | 10 ++++++++++
 .../apache/kylin/rest/controller/NAsyncQueryController.java   |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git 
a/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java 
b/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
index d36e2c2c41..10ddbb586f 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
@@ -1699,4 +1699,15 @@ public class CnMessage extends Message {
     public String getLoadLogicalViewError(String tableName, String project) {
         return String.format(Locale.ROOT, "无法加载表: %s , 仅支持在项目 %s 中加载此表", 
tableName, project);
     }
+
+    @Override
+    public String getAsyncQueryCancel(String queryId) {
+        return String.format(Locale.ROOT, "ID为%s的异步查询正被执行取消。", queryId);
+
+    }
+
+    @Override
+    public String getQueryNotRunningError() {
+        return "该查询没有在运行，请检查";
+    }
 }
diff --git 
a/src/core-common/src/main/java/org/apache/kylin/common/msg/Message.java 
b/src/core-common/src/main/java/org/apache/kylin/common/msg/Message.java
index ade226726c..6d3aab37de 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/msg/Message.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/msg/Message.java
@@ -1604,4 +1604,14 @@ public class Message {
     public String getLoadLogicalViewError(String tableName, String project) {
         return String.format(Locale.ROOT, LOAD_LOGICAL_VIEW_ERROR, tableName, 
project);
     }
+
+    public String getAsyncQueryCancel(String queryId) {
+        return String.format(Locale.ROOT, "Async Query（id=%s） will be 
canceled", queryId);
+
+    }
+
+    public String getQueryNotRunningError() {
+        return "Query is not running, please check.";
+    }
+
 }
diff --git 
a/src/query-server/src/main/java/org/apache/kylin/rest/controller/NAsyncQueryController.java
 
b/src/query-server/src/main/java/org/apache/kylin/rest/controller/NAsyncQueryController.java
index 5616116f6e..c92a62751d 100644
--- 
a/src/query-server/src/main/java/org/apache/kylin/rest/controller/NAsyncQueryController.java
+++ 
b/src/query-server/src/main/java/org/apache/kylin/rest/controller/NAsyncQueryController.java
@@ -273,7 +273,7 @@ public class NAsyncQueryController extends NBasicController 
{
         }
         queryService.stopQuery(queryId);
         EventBusFactory.getInstance().postAsync(new 
StopQueryBroadcastEventNotifier(queryId));
-        return new EnvelopeResponse<>(KylinException.CODE_SUCCESS, "", "");
+        return new EnvelopeResponse<>(KylinException.CODE_SUCCESS, "", 
MsgPicker.getMsg().getAsyncQueryCancel(queryId));
     }
 
     @ApiOperation(value = "query", tags = { "QE" }, notes = "Update Response: 
query_id")