This is an automated email from the ASF dual-hosted git repository.
lichaoyong 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 fbf7bd6 [Bug] Change get load state interface (#4081)
fbf7bd6 is described below
commit fbf7bd6a1de9caefa58f122e91f1387430df870c
Author: lichaoyong <lichaoyong...@gmail.com>
AuthorDate: Mon Jul 20 15:51:27 2020 +0800
[Bug] Change get load state interface (#4081)
Now, the PathTrie will match wrong interface between
/api/{db}/{table} and /api/{db}/{label}
---
docs/.vuepress/sidebar/en.js | 2 +-
docs/.vuepress/sidebar/zh-CN.js | 2 +-
.../http-actions/{get-label-state.md => get-load-state.md} | 8 ++++----
.../http-actions/{get-label-state.md => get-load-state.md} | 8 ++++----
.../main/java/org/apache/doris/http/rest/GetStreamLoadState.java | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/docs/.vuepress/sidebar/en.js b/docs/.vuepress/sidebar/en.js
index c661f85..1b865b8 100644
--- a/docs/.vuepress/sidebar/en.js
+++ b/docs/.vuepress/sidebar/en.js
@@ -76,7 +76,7 @@ module.exports = [
"cancel-label",
"compaction-action",
"fe-get-log-file",
- "get-label-state",
+ "get-load-state",
"restore-tablet",
"profile-action",
"connection-action",
diff --git a/docs/.vuepress/sidebar/zh-CN.js b/docs/.vuepress/sidebar/zh-CN.js
index 4e46246..fcbd17d 100644
--- a/docs/.vuepress/sidebar/zh-CN.js
+++ b/docs/.vuepress/sidebar/zh-CN.js
@@ -83,7 +83,7 @@ module.exports = [
"cancel-label",
"compaction-action",
"fe-get-log-file",
- "get-label-state",
+ "get-load-state",
"restore-tablet",
"profile-action",
"connection-action",
diff --git a/docs/en/administrator-guide/http-actions/get-label-state.md
b/docs/en/administrator-guide/http-actions/get-load-state.md
similarity index 85%
rename from docs/en/administrator-guide/http-actions/get-label-state.md
rename to docs/en/administrator-guide/http-actions/get-load-state.md
index ac24f3c..df2a5a8 100644
--- a/docs/en/administrator-guide/http-actions/get-label-state.md
+++ b/docs/en/administrator-guide/http-actions/get-load-state.md
@@ -27,10 +27,10 @@ under the License.
# GET LABEL STATE
## description
NAME:
- get_label_state: get label's state
+ get_load_state: get load's state of label
SYNOPSIS
- curl -u user:passwd http://host:port/api/{db}/{label}/_state
+ curl -u user:passwd http://host:port/api/{db}/get_load_state?label=xxx
DESCRIPTION
@@ -51,9 +51,9 @@ under the License.
1. Get status of label "testLabel" on database "testDb"
- curl -u root http://host:port/api/testDb/testLabel/_state
+ curl -u root http://host:port/api/testDb/get_load_state?label=testLabel
## keyword
- GET, LABEL, STATE
+ GET, LOAD, STATE
diff --git a/docs/zh-CN/administrator-guide/http-actions/get-label-state.md
b/docs/zh-CN/administrator-guide/http-actions/get-load-state.md
similarity index 88%
rename from docs/zh-CN/administrator-guide/http-actions/get-label-state.md
rename to docs/zh-CN/administrator-guide/http-actions/get-load-state.md
index 65f9210..77ddcb8 100644
--- a/docs/zh-CN/administrator-guide/http-actions/get-label-state.md
+++ b/docs/zh-CN/administrator-guide/http-actions/get-load-state.md
@@ -27,10 +27,10 @@ under the License.
# GET LABEL STATE
## description
NAME:
- get_label_state: get label's state
+ get_load_state: get load's state by label
SYNOPSIS
- curl -u user:passwd http://host:port/api/{db}/{label}/_state
+ curl -u user:passwd http://host:port/api/{db}/get_load_state?label=xxx
DESCRIPTION
该命令用于查看一个Label对应的事务状态
@@ -52,8 +52,8 @@ under the License.
## example
1. 获得testDb, testLabel的状态
- curl -u root http://host:port/api/testDb/testLabel/_state
+ curl -u root http://host:port/api/testDb/get_load_state?label=testLabel
## keyword
- GET, LABEL, STATE
+ GET, LOAD, STATE
diff --git
a/fe/src/main/java/org/apache/doris/http/rest/GetStreamLoadState.java
b/fe/src/main/java/org/apache/doris/http/rest/GetStreamLoadState.java
index 8f1a26f..57b2348 100644
--- a/fe/src/main/java/org/apache/doris/http/rest/GetStreamLoadState.java
+++ b/fe/src/main/java/org/apache/doris/http/rest/GetStreamLoadState.java
@@ -39,7 +39,7 @@ public class GetStreamLoadState extends RestBaseAction {
public static void registerAction(ActionController controller)
throws IllegalArgException {
GetStreamLoadState action = new GetStreamLoadState(controller);
- controller.registerHandler(HttpMethod.GET, "/api/{" + DB_KEY + "}/{" +
LABEL_KEY + "}/_state", action);
+ controller.registerHandler(HttpMethod.GET, "/api/{" + DB_KEY +
"}/get_load_state", action);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
