This is an automated email from the ASF dual-hosted git repository.
jiafengzheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 8c5005f247 [typo](doc)Add the backup operation, using the following
instructions from S3 (#12091)
8c5005f247 is described below
commit 8c5005f247aaa40c37078ea9562306e509df74ac
Author: jiafeng.zhang <zhang...@gmail.com>
AuthorDate: Sat Aug 27 10:07:15 2022 +0800
[typo](doc)Add the backup operation, using the following instructions from
S3 (#12091)
Add the backup operation, using the following instructions from S3
---
docs/en/docs/admin-manual/config/be-config.md | 2 +-
docs/en/docs/admin-manual/data-admin/backup.md | 19 ++++++++++++++++
.../Backup-and-Restore/CREATE-REPOSITORY.md | 11 +++++-----
docs/zh-CN/docs/admin-manual/config/be-config.md | 2 +-
docs/zh-CN/docs/admin-manual/data-admin/backup.md | 21 +++++++++++++++++-
.../Backup-and-Restore/CREATE-REPOSITORY.md | 1 +
.../Show-Statements/SHOW-STREAM-LOAD.md | 25 +++++++++++-----------
7 files changed, 61 insertions(+), 20 deletions(-)
diff --git a/docs/en/docs/admin-manual/config/be-config.md
b/docs/en/docs/admin-manual/config/be-config.md
index 9b9f24b39c..b110cefc54 100644
--- a/docs/en/docs/admin-manual/config/be-config.md
+++ b/docs/en/docs/admin-manual/config/be-config.md
@@ -61,7 +61,7 @@ There are two ways to configure BE configuration items:
In version 0.13 and before, the configuration items modified in this way
will become invalid after the BE process restarts. In 0.14 and later versions,
the modified configuration can be persisted through the following command. The
modified configuration items are stored in the `be_custom.conf` file.
```
- curl -X POST
http://{be_ip}:{be_http_port}/api/update_config?{key}={value}&persis=true'
+ curl -X POST
http://{be_ip}:{be_http_port}/api/update_config?{key}={value}&persis=true
```
## Examples
diff --git a/docs/en/docs/admin-manual/data-admin/backup.md
b/docs/en/docs/admin-manual/data-admin/backup.md
index 23c2a0dc23..dc11fb55c7 100644
--- a/docs/en/docs/admin-manual/data-admin/backup.md
+++ b/docs/en/docs/admin-manual/data-admin/backup.md
@@ -69,6 +69,25 @@ ALTER TABLE tbl1 SET ("dynamic_partition.enable"="true")
);
```
+2. Create a remote repository for s3 : s3_repo
+
+ ```
+ CREATE REPOSITORY `s3_repo`
+ WITH S3
+ ON LOCATION "s3://bucket_name/test"
+ PROPERTIES
+ (
+ "AWS_ENDPOINT" = "http://xxxx.xxxx.com";,
+ "AWS_ACCESS_KEY" = "xxxx",
+ "AWS_SECRET_KEY" = "xxx",
+ "AWS_REGION" = "xxx"
+ );
+ ```
+
+ >Note that.
+ >
+ >ON LOCATION is followed by Bucket Name here
+
1. Full backup of table example_tbl under example_db to warehouse example_repo:
```sql
diff --git
a/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Backup-and-Restore/CREATE-REPOSITORY.md
b/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Backup-and-Restore/CREATE-REPOSITORY.md
index 5bef2f3048..359aabd01f 100644
---
a/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Backup-and-Restore/CREATE-REPOSITORY.md
+++
b/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Backup-and-Restore/CREATE-REPOSITORY.md
@@ -48,6 +48,7 @@ illustrate:
- Creation of repositories, relying on existing brokers or accessing cloud
storage directly through AWS s3 protocol, or accessing HDFS directly.
- If it is a read-only repository, restores can only be done on the
repository. If not, backup and restore operations are available.
- PROPERTIES are different according to different types of broker or S3 or
hdfs, see the example for details.
+- ON LOCATION ： if it is S3 , here followed by the Bucket Name.
### Example
@@ -118,11 +119,13 @@ PROPERTIES
"fs.defaultFS"="hdfs://hadoop-name-node:54310",
"hadoop.username"="user"
);
-```
+### Keywords
+
+```
6. Create a repository named minio_repo to link minio storage directly through
the s3 protocol.
-```sql
+```
CREATE REPOSITORY `minio_repo`
WITH S3
ON LOCATION "s3://minio_repo"
@@ -138,9 +141,7 @@ PROPERTIES
### Keywords
-```
-CREATE, REPOSITORY
-```
+ CREATE, REPOSITORY
### Best Practice
diff --git a/docs/zh-CN/docs/admin-manual/config/be-config.md
b/docs/zh-CN/docs/admin-manual/config/be-config.md
index c94cda7b76..5644cd4b41 100644
--- a/docs/zh-CN/docs/admin-manual/config/be-config.md
+++ b/docs/zh-CN/docs/admin-manual/config/be-config.md
@@ -59,7 +59,7 @@ BE 的配置项有两种方式进行配置：
在 0.13 版本及之前，通过该方式修改的配置项将在 BE 进程重启后失效。在 0.14
及之后版本中，可以通过以下命令持久化修改后的配置。修改后的配置项存储在 `be_custom.conf` 文件中。
```
- curl -X POST
http://{be_ip}:{be_http_port}/api/update_config?{key}={value}&persist=true'
+ curl -X POST
http://{be_ip}:{be_http_port}/api/update_config?{key}={value}&persist=true
```
## 应用举例
diff --git a/docs/zh-CN/docs/admin-manual/data-admin/backup.md
b/docs/zh-CN/docs/admin-manual/data-admin/backup.md
index e3be015ba4..7c3ebc26b3 100644
--- a/docs/zh-CN/docs/admin-manual/data-admin/backup.md
+++ b/docs/zh-CN/docs/admin-manual/data-admin/backup.md
@@ -56,7 +56,7 @@ Doris 支持将当前数据以文件的形式，通过 broker 备份到远端存
## 开始备份
-1. 创建一个hdfs的远程仓库example_repo：
+1. 创建一个 hdfs 的远程仓库 example_repo：
```sql
CREATE REPOSITORY `example_repo`
@@ -69,6 +69,25 @@ Doris 支持将当前数据以文件的形式，通过 broker 备份到远端存
);
```
+2. 创建一个 s3 的远程仓库 : s3_repo
+
+ ```
+ CREATE REPOSITORY `s3_repo`
+ WITH S3
+ ON LOCATION "s3://bucket_name/test"
+ PROPERTIES
+ (
+ "AWS_ENDPOINT" = "http://xxxx.xxxx.com";,
+ "AWS_ACCESS_KEY" = "xxxx",
+ "AWS_SECRET_KEY"="xxx",
+ "AWS_REGION" = "xxx"
+ );
+ ```
+
+ >注意：
+ >
+ >ON LOCATION 这里后面跟的是 Bucket Name
+
2. 全量备份 example_db 下的表 example_tbl 到仓库 example_repo 中：
```sql
diff --git
a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Backup-and-Restore/CREATE-REPOSITORY.md
b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Backup-and-Restore/CREATE-REPOSITORY.md
index c43e6c7330..b61c24dcb4 100644
---
a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Backup-and-Restore/CREATE-REPOSITORY.md
+++
b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Backup-and-Restore/CREATE-REPOSITORY.md
@@ -48,6 +48,7 @@ PROPERTIES ("key"="value", ...);
- 仓库的创建，依赖于已存在的 broker 或者直接通过AWS s3 协议访问云存储，或者直接访问HDFS
- 如果是只读仓库，则只能在仓库上进行恢复。如果不是，则可以进行备份和恢复操作。
- 根据 broker 或者S3、hdfs的不同类型，PROPERTIES 有所不同，具体见示例。
+- ON LOCATION ,如果是 S3 , 这里后面跟的是 Bucket Name。
### Example
diff --git
a/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-STREAM-LOAD.md
b/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-STREAM-LOAD.md
index a34cb8dc91..516c85a0cc 100644
---
a/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-STREAM-LOAD.md
+++
b/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-STREAM-LOAD.md
@@ -50,14 +50,15 @@ SHOW STREAM LOAD
说明：
-1.默认 BE 是不记录 Stream Load 的记录，如果你要查看需要在 BE
上启用记录，配置参数是：`enable_stream_load_record=true` ，具体怎么配置请参照 [BE
配置项](https://doris.apache.org/zh-CN/docs/admin-manual/config/be-config)
-2. 如果不指定 db_name，使用当前默认db
-3. 如果使用 LABEL LIKE，则会匹配Stream Load任务的 label 包含 label_matcher 的任务
-4. 如果使用 LABEL = ，则精确匹配指定的 label
-5. 如果指定了 STATUS，则匹配 STREAM LOAD 状态
-6. 可以使用 ORDER BY 对任意列组合进行排序
-7. 如果指定了 LIMIT，则显示 limit 条匹配记录。否则全部显示
-8. 如果指定了 OFFSET，则从偏移量offset开始显示查询结果。默认情况下偏移量为0。
+1. 默认 BE 是不记录 Stream Load 的记录，如果你要查看需要在 BE
上启用记录，配置参数是：`enable_stream_load_record=true` ，具体怎么配置请参照 [BE
配置项](https://doris.apache.org/zh-CN/docs/admin-manual/config/be-config)
+2. 如果不指定 db_name，使用当前默认db
+
+2. 如果使用 LABEL LIKE，则会匹配Stream Load任务的 label 包含 label_matcher 的任务
+3. 如果使用 LABEL = ，则精确匹配指定的 label
+4. 如果指定了 STATUS，则匹配 STREAM LOAD 状态
+5. 可以使用 ORDER BY 对任意列组合进行排序
+6. 如果指定了 LIMIT，则显示 limit 条匹配记录。否则全部显示
+7. 如果指定了 OFFSET，则从偏移量offset开始显示查询结果。默认情况下偏移量为0。
### Example
@@ -68,25 +69,25 @@ SHOW STREAM LOAD
```
2. 展示指定 db 的Stream Load任务，label 中包含字符串 "2014_01_02"，展示最老的10个
-
+
```sql
SHOW STREAM LOAD FROM example_db WHERE LABEL LIKE "2014_01_02" LIMIT 10;
```
2. 展示指定 db 的Stream Load任务，指定 label 为 "load_example_db_20140102"
-
+
```sql
SHOW STREAM LOAD FROM example_db WHERE LABEL = "load_example_db_20140102";
```
2. 展示指定 db 的Stream Load任务，指定 status 为 "success", 并按 StartTime 降序排序
-
+
```sql
SHOW STREAM LOAD FROM example_db WHERE STATUS = "success" ORDER BY
StartTime DESC;
```
2. 展示指定 db 的导入任务 并按 StartTime 降序排序,并从偏移量5开始显示10条查询结果
-
+
```sql
SHOW STREAM LOAD FROM example_db ORDER BY StartTime DESC limit 5,10;
SHOW STREAM LOAD FROM example_db ORDER BY StartTime DESC limit 10 offset 5;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
