This is an automated email from the ASF dual-hosted git repository.
yangzhg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 5bfae76 Fix cancel load path variable LABEL_KEY (#5724) (#5725)
5bfae76 is described below
commit 5bfae7674c8675009c5bb0bcb687a915ef3d8713
Author: ccoffline <[email protected]>
AuthorDate: Fri Apr 30 10:14:51 2021 +0800
Fix cancel load path variable LABEL_KEY (#5724) (#5725)
Co-authored-by: 迟成 <[email protected]>
---
docs/en/administrator-guide/http-actions/cancel-label.md | 4 ++--
docs/zh-CN/administrator-guide/http-actions/cancel-label.md | 4 ++--
.../src/main/java/org/apache/doris/http/rest/CancelStreamLoad.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/en/administrator-guide/http-actions/cancel-label.md
b/docs/en/administrator-guide/http-actions/cancel-label.md
index f668238..e60393e 100644
--- a/docs/en/administrator-guide/http-actions/cancel-label.md
+++ b/docs/en/administrator-guide/http-actions/cancel-label.md
@@ -30,7 +30,7 @@ under the License.
cancel_label: cancel a transaction with label
SYNOPSIS
- curl -u user:passwd -XPOST http://host:port/api/{db}/{label}/_cancel
+ curl -u user:passwd -XPOST
http://host:port/api/{db}/_cancel?label={label}
DESCRIPTION
@@ -51,7 +51,7 @@ under the License.
1. Cancel the transaction with label "testLabel" on database "testDb"
- curl -u root -XPOST http://host:port/api/testDb/testLabel/_cancel
+ curl -u root -XPOST http://host:port/api/testDb/_cancel?label=testLabel
## keyword
diff --git a/docs/zh-CN/administrator-guide/http-actions/cancel-label.md
b/docs/zh-CN/administrator-guide/http-actions/cancel-label.md
index ecdb52c..1dcdfd6 100644
--- a/docs/zh-CN/administrator-guide/http-actions/cancel-label.md
+++ b/docs/zh-CN/administrator-guide/http-actions/cancel-label.md
@@ -30,7 +30,7 @@ under the License.
cancel_label: cancel a transaction with label
SYNOPSIS
- curl -u user:passwd -XPOST http://host:port/api/{db}/{label}/_cancel
+ curl -u user:passwd -XPOST
http://host:port/api/{db}/_cancel?label={label}
DESCRIPTION
该命令用于cancel一个指定Label对应的事务，事务在Prepare阶段能够被成功cancel
@@ -47,7 +47,7 @@ under the License.
## example
1. cancel testDb, testLabel的作业
- curl -u root -XPOST http://host:port/api/testDb/testLabel/_cancel
+ curl -u root -XPOST http://host:port/api/testDb/_cancel?label=testLabel
## keyword
CANCEL，LABEL
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/http/rest/CancelStreamLoad.java
b/fe/fe-core/src/main/java/org/apache/doris/http/rest/CancelStreamLoad.java
index 0520706..ec0c37d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/http/rest/CancelStreamLoad.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/http/rest/CancelStreamLoad.java
@@ -40,7 +40,7 @@ public class CancelStreamLoad extends RestBaseAction {
public static void registerAction(ActionController controller)
throws IllegalArgException {
CancelStreamLoad action = new CancelStreamLoad(controller);
- controller.registerHandler(HttpMethod.POST, "/api/{" + DB_KEY + "}/{"
+ LABEL_KEY + "}/_cancel", action);
+ controller.registerHandler(HttpMethod.POST, "/api/{" + DB_KEY +
"}/_cancel", action);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
