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/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 352d93b566 [Refactor][doc] Fixed some issues in en and zh-CN docs
(#9068)
352d93b566 is described below
commit 352d93b5664d60c53e003322547d4193dc979588
Author: smallhibiscus <[email protected]>
AuthorDate: Mon Apr 18 08:24:57 2022 +0800
[Refactor][doc] Fixed some issues in en and zh-CN docs (#9068)
* Modify some error in en and zh-CN docs
---
new-docs/en/admin-manual/data-admin/backup.md | 2 +-
.../admin-manual/privilege-ldap/user-privilege.md | 2 +-
new-docs/en/benchmark/ssb.md | 2 +-
.../data-operate/import/import-scenes/jdbc-load.md | 4 +-
.../import/import-scenes/kafka-load.md | 2 +-
.../en/data-operate/update-delete/delete-manual.md | 31 ++++++-------
new-docs/en/data-operate/update-delete/update.md | 2 +-
.../en/ecosystem/external-table/odbc-of-doris.md | 2 +-
new-docs/en/faq/install-faq.md | 2 +-
new-docs/en/get-starting/get-starting.md | 8 ++--
.../Show-Statements/SHOW-CREATE-DATABASE.md | 33 +++++++++++--
new-docs/package-lock.json | 12 +++--
.../cluster-management/load-balancing.md | 2 +-
new-docs/zh-CN/admin-manual/data-admin/backup.md | 2 +-
.../admin-manual/privilege-ldap/user-privilege.md | 2 +-
new-docs/zh-CN/benchmark/ssb.md | 2 +-
.../data-operate/import/import-scenes/jdbc-load.md | 4 +-
.../import/import-scenes/kafka-load.md | 2 +-
.../update-delete/batch-delete-manual.md | 54 +++++++++++-----------
.../data-operate/update-delete/delete-manual.md | 12 ++---
.../update-delete/sequence-column-manual.md | 16 +++----
.../zh-CN/data-operate/update-delete/update.md | 2 +-
.../ecosystem/external-table/odbc-of-doris.md | 4 +-
new-docs/zh-CN/faq/install-faq.md | 2 +-
new-docs/zh-CN/get-starting/get-starting.md | 8 ++--
.../Backup-and-Restore/RECOVER.md | 2 +-
.../Manipulation/INSERT.md | 2 +-
.../Show-Statements/SHOW-COLUMNS.md | 6 +--
.../Show-Statements/SHOW-CREATE-DATABASE.md | 24 ++++++++++
29 files changed, 150 insertions(+), 98 deletions(-)
diff --git a/new-docs/en/admin-manual/data-admin/backup.md
b/new-docs/en/admin-manual/data-admin/backup.md
index dd00156599..357c21886c 100644
--- a/new-docs/en/admin-manual/data-admin/backup.md
+++ b/new-docs/en/admin-manual/data-admin/backup.md
@@ -122,7 +122,7 @@ ALTER TABLE tbl1 SET ("dynamic_partition.enable"="true")
1 row in set (0.15 sec)
```
-For the detailed usage of BACKUP, please refer to
[here](../../sql-manual/sql-reference-v2/Show-Statements/BACKUP.html).
+For the detailed usage of BACKUP, please refer to
[here](../../sql-manual/sql-reference-v2/Data-Definition-Statements/Backup-and-Restore/BACKUP.html).
## Best Practices
diff --git a/new-docs/en/admin-manual/privilege-ldap/user-privilege.md
b/new-docs/en/admin-manual/privilege-ldap/user-privilege.md
index 60ac1a17b9..65ea250c0d 100644
--- a/new-docs/en/admin-manual/privilege-ldap/user-privilege.md
+++ b/new-docs/en/admin-manual/privilege-ldap/user-privilege.md
@@ -223,4 +223,4 @@ Here are some usage scenarios of Doris privilege system.
## More help
-For more detailed syntax and best practices for permission management use,
please refer to the
[GRANTS](../sql-manual/sql-reference-v2/Account-Management-Statements/GRANT.html)
command manual. Enter `HELP GRANTS` at the command line of the MySql client
for more help information.
+For more detailed syntax and best practices for permission management use,
please refer to the
[GRANTS](../../sql-manual/sql-reference-v2/Account-Management-Statements/GRANT.html)
command manual. Enter `HELP GRANTS` at the command line of the MySql client
for more help information.
diff --git a/new-docs/en/benchmark/ssb.md b/new-docs/en/benchmark/ssb.md
index 1e7028efb1..cc2beaf61c 100644
--- a/new-docs/en/benchmark/ssb.md
+++ b/new-docs/en/benchmark/ssb.md
@@ -178,4 +178,4 @@ The following test report is based on Doris
[branch-0.15](https://github.com/apa
>
> Note 4: Parallelism means query concurrency, which is set by `set
parallel_fragment_exec_instance_num=8`.
>
- > Note 5: Runtime Filter Mode is the type of Runtime Filter, set by `set
runtime_filter_type="BLOOM_FILTER"`. ([Runtime
Filter](http://doris.incubator.apache.org/master/en/administrator-guide/runtime-filter.html)
function has a significant effect on the SSB test set. Because in this test
set, The data from the right table of Join can filter the left table very well.
You can try to turn off this function through `set runtime_filter_mode=off` to
see the change in query latency.)
+ > Note 5: Runtime Filter Mode is the type of Runtime Filter, set by `set
runtime_filter_type="BLOOM_FILTER"`. ([Runtime
Filter](../../advanced/join-optimization/runtime-filter.html) function has a
significant effect on the SSB test set. Because in this test set, The data from
the right table of Join can filter the left table very well. You can try to
turn off this function through `set runtime_filter_mode=off` to see the change
in query latency.)
diff --git a/new-docs/en/data-operate/import/import-scenes/jdbc-load.md
b/new-docs/en/data-operate/import/import-scenes/jdbc-load.md
index 59b96895f8..056809f44b 100644
--- a/new-docs/en/data-operate/import/import-scenes/jdbc-load.md
+++ b/new-docs/en/data-operate/import/import-scenes/jdbc-load.md
@@ -35,7 +35,7 @@ The INSERT statement is used in a similar way to the INSERT
statement used in da
* INSERT INTO table VALUES(...)
````
-Here we only introduce the second way. For a detailed description of the
INSERT command, see the [INSERT]() command documentation.
+Here we only introduce the second way. For a detailed description of the
INSERT command, see the
[INSERT](../../../sql-manual/sql-reference-v2/Data-Manipulation-Statements/Manipulation/INSERT.html)
command documentation.
## single write
@@ -160,4 +160,4 @@ Please note the following:
As mentioned earlier, we recommend that when using INSERT to import data,
use the "batch" method to import, rather than a single insert.
- At the same time, we can set a Label for each INSERT operation. Through the
[Label mechanism](./load-atomicity.html#label-mechanism), the idempotency and
atomicity of operations can be guaranteed, and the data will not be lost or
heavy in the end. For the specific usage of Label in INSERT, you can refer to
the
[INSERT](../../../sql-manual/sql-reference-v2/Data-Manipulation-Statements/Manipulation/INSERT.html#insert)
document.
\ No newline at end of file
+ At the same time, we can set a Label for each INSERT operation. Through the
[Label mechanism](./load-atomicity.html#label-mechanism), the idempotency and
atomicity of operations can be guaranteed, and the data will not be lost or
heavy in the end. For the specific usage of Label in INSERT, you can refer to
the
[INSERT](../../../sql-manual/sql-reference-v2/Data-Manipulation-Statements/Manipulation/INSERT.html)
document.
\ No newline at end of file
diff --git a/new-docs/en/data-operate/import/import-scenes/kafka-load.md
b/new-docs/en/data-operate/import/import-scenes/kafka-load.md
index d2b42e7043..abfc0d3f40 100644
--- a/new-docs/en/data-operate/import/import-scenes/kafka-load.md
+++ b/new-docs/en/data-operate/import/import-scenes/kafka-load.md
@@ -120,7 +120,7 @@ Only the currently running tasks can be viewed, and the
completed and unstarted
### Modify job properties
-The user can modify some properties of the job that has been created. For
details, please refer to the [ALTER ROUTINE LOAD]() command manual.
+The user can modify some properties of the job that has been created. For
details, please refer to the [ALTER ROUTINE
LOAD](../../../sql-manual/sql-reference-v2/Data-Manipulation-Statements/Load/ALTER-ROUTINE-LOAD.html)
command manual.
### Job Control
diff --git a/new-docs/en/data-operate/update-delete/delete-manual.md
b/new-docs/en/data-operate/update-delete/delete-manual.md
index fb9ac65c46..249d1cc07e 100644
--- a/new-docs/en/data-operate/update-delete/delete-manual.md
+++ b/new-docs/en/data-operate/update-delete/delete-manual.md
@@ -42,7 +42,7 @@ The delete command is an SQL command, and the returned
results are synchronous.
If delete completes successfully and is visible, the following results will
be returned, `query OK` indicates success.
- ```
+ ```sql
mysql> delete from test_tbl PARTITION p1 where k1 = 1;
Query OK, 0 rows affected (0.04 sec)
{'label':'delete_e7830c72-eb14-4cb9-bbb6-eebd4511d251',
'status':'VISIBLE', 'txnId':'4005'}
@@ -50,28 +50,25 @@ The delete command is an SQL command, and the returned
results are synchronous.
2. Submitted successfully, but not visible
+ The transaction submission of Doris is divided into two steps: submission
and publish version. Only after the publish version step is completed, the
result will be visible to the user. If it has been submitted successfully, then
it can be considered that the publish version step will eventually success.
Doris will try to wait for publishing for a period of time after submitting. If
it has timed out, even if the publishing version has not been completed, it
will return to the user in p [...]
-~~~text
-The transaction submission of Doris is divided into two steps: submission and
publish version. Only after the publish version step is completed, the result
will be visible to the user. If it has been submitted successfully, then it can
be considered that the publish version step will eventually success. Doris will
try to wait for publishing for a period of time after submitting. If it has
timed out, even if the publishing version has not been completed, it will
return to the user in prio [...]
-
-```
-mysql> delete from test_tbl PARTITION p1 where k1 = 1;
-Query OK, 0 rows affected (0.04 sec)
-{'label':'delete_e7830c72-eb14-4cb9-bbb6-eebd4511d251', 'status':'COMMITTED',
'txnId':'4005', 'err':'delete job is committed but may be taking effect later' }
-```
+ ```sql
+ mysql> delete from test_tbl PARTITION p1 where k1 = 1;
+ Query OK, 0 rows affected (0.04 sec)
+ {'label':'delete_e7830c72-eb14-4cb9-bbb6-eebd4511d251',
'status':'COMMITTED', 'txnId':'4005', 'err':'delete job is committed but may be
taking effect later' }
+ ```
- The result will return a JSON string at the same time:
+ The result will return a JSON string at the same time:
-`affected rows`: Indicates the row affected by this deletion. Since the
deletion of Doris is currently a logical deletion, the value is always 0.
+ `affected rows`: Indicates the row affected by this deletion. Since the
deletion of Doris is currently a logical deletion, the value is always 0.
-`label`: The label generated automatically to be the signature of the delete
jobs. Each job has a unique label within a single database.
+ `label`: The label generated automatically to be the signature of the
delete jobs. Each job has a unique label within a single database.
-`status`: Indicates whether the data deletion is visible. If it is visible,
`visible` will be displayed. If it is not visible, `committed` will be
displayed.
+ `status`: Indicates whether the data deletion is visible. If it is visible,
`visible` will be displayed. If it is not visible, `committed` will be
displayed.
-`txnId`: The transaction ID corresponding to the delete job
+ `txnId`: The transaction ID corresponding to the delete job
-`err`: Field will display some details of this deletion
-~~~
+ `err`: Field will display some details of this deletion
3. Commit failed, transaction cancelled
@@ -138,7 +135,7 @@ The user can view the deletion completed in history through
the show delete stat
Syntax
-```
+```sql
SHOW DELETE [FROM db_name]
```
diff --git a/new-docs/en/data-operate/update-delete/update.md
b/new-docs/en/data-operate/update-delete/update.md
index 2c8b2133a2..862face11e 100644
--- a/new-docs/en/data-operate/update-delete/update.md
+++ b/new-docs/en/data-operate/update-delete/update.md
@@ -68,7 +68,7 @@ However, in practice, the concurrency limit can be turned on
manually if the use
Since Doris currently supports row updates and uses a two-step read-and-write
operation, there is uncertainty about the outcome of an Update statement if it
modifies the same row as another Import or Delete statement.
-Therefore, when using Doris, you must be careful to control the concurrency of
Update statements and other DML statements on the *user side itself*.
+Therefore, when using Doris, you must be careful to control the concurrency of
Update statements and other DML statements on the **user side itself**.
## Usage example
diff --git a/new-docs/en/ecosystem/external-table/odbc-of-doris.md
b/new-docs/en/ecosystem/external-table/odbc-of-doris.md
index 3ed7769292..325462e492 100644
--- a/new-docs/en/ecosystem/external-table/odbc-of-doris.md
+++ b/new-docs/en/ecosystem/external-table/odbc-of-doris.md
@@ -329,7 +329,7 @@ There are different data types among different databases.
Here, the types in eac
Sync for small amounts of data
-For example, a table in Mysql has 1 million data. If you want to synchronize
to doris, you can use ODBC to map the data. When using[insert
into](http://localhost:8080/zh-CN/data-operate/import/import-way/insert-into-manual.html)way
to synchronize data to Doris, if you want to synchronize large batches of
data,Can be used in batches[insert
into](http://localhost:8080/zh-CN/data-operate/import/import-way/insert-into-manual.html)Sync
(deprecated)
+For example, a table in Mysql has 1 million data. If you want to synchronize
to doris, you can use ODBC to map the data. When using[insert
into](../../data-operate/import/import-way/insert-into-manual.html)way to
synchronize data to Doris, if you want to synchronize large batches of data,Can
be used in batches[insert
into](../../data-operate/import/import-way/insert-into-manual.html)Sync
(deprecated)
## Q&A
diff --git a/new-docs/en/faq/install-faq.md b/new-docs/en/faq/install-faq.md
index b42c2c8a8f..631cba1784 100644
--- a/new-docs/en/faq/install-faq.md
+++ b/new-docs/en/faq/install-faq.md
@@ -81,7 +81,7 @@ Here we provide 3 ways to solve this problem:
3. Manually migrate data using the API
- Doris provides [HTTP
API](../advanced/http-actions/tablet-migration-action.html), which can manually
specify the migration of data shards on one disk to another disk.
+ Doris provides [HTTP
API](../admin-manual/http-actions/tablet-migration-action.html), which can
manually specify the migration of data shards on one disk to another disk.
### Q5. How to read FE/BE logs correctly?
diff --git a/new-docs/en/get-starting/get-starting.md
b/new-docs/en/get-starting/get-starting.md
index 52d5b51ffd..bfbda2b793 100644
--- a/new-docs/en/get-starting/get-starting.md
+++ b/new-docs/en/get-starting/get-starting.md
@@ -63,10 +63,10 @@ This article is applicable to multi-platform
(Win|Mac|Linux) and multi-mode (bar
2. Download binary package / self-compile FE / BE files
```shell
- wget https://doris.apache.org/apache-doris-release/version to deploy
+ wget https://dist.apache.org/repos/dist/dev/incubator/doris to deploy
wget https://palo-cloud-repo-bd.bd.bcebos.com/baidu-doris-release/version
to deploy
# For example the following link
- wget https://doris.apache.org/release/doris-1.0.0.tar.gz
+ wget
https://dist.apache.org/repos/dist/dev/incubator/doris/1.0/1.0.0-rc03/apache-doris-1.0.0-incubating-bin.tar.gz
wget
https://palo-cloud-repo-bd.bd.bcebos.com/baidu-doris-release/PALO-1.0.0-preview2-no-avx2-binary.tar.gz
```
@@ -75,7 +75,7 @@ This article is applicable to multi-platform (Win|Mac|Linux)
and multi-mode (bar
```shell
tar -zxvf Downloaded binary archive
# example
- tar -zxvf PALO-1.0.0-preview2-no-avx2-binary.tar.gz
+ tar -zxvf apache-doris-1.0.0-incubating-bin.tar.gz
```
4. Migrate the decompressed program files to the specified directory and
rename them
@@ -84,7 +84,7 @@ This article is applicable to multi-platform (Win|Mac|Linux)
and multi-mode (bar
mv [unzipped root directory] [Target path]
cd [Target path]
# example
- mv PALO-1.0.0-preview2-no-avx2-binary /opt/doris
+ mv apache-doris-1.0.0-incubating-bin /opt/doris
cd /opt/doris
```
diff --git
a/new-docs/en/sql-manual/sql-reference-v2/Show-Statements/SHOW-CREATE-DATABASE.md
b/new-docs/en/sql-manual/sql-reference-v2/Show-Statements/SHOW-CREATE-DATABASE.md
index 53e4ec81ad..78f6515e34 100644
---
a/new-docs/en/sql-manual/sql-reference-v2/Show-Statements/SHOW-CREATE-DATABASE.md
+++
b/new-docs/en/sql-manual/sql-reference-v2/Show-Statements/SHOW-CREATE-DATABASE.md
@@ -26,13 +26,40 @@ under the License.
## SHOW-CREATE-DATABASE
+### Name
+
+SHOW CREATE DATABASE
+
### Description
+This statement checks the creation of the doris database.
+
+grammar:
+
+```sql
+SHOW CREATE DATABASE db_name;
+````
+
+illustrate:
+
+- `db_name`: The name of the database where doris exists.
+
### Example
-### Keywords
+1. View the creation of the test database in doris
- SHOW, CREATE, DATABASE
+ ```sql
+ mysql> SHOW CREATE DATABASE test;
+ +----------+----------------------------+
+ | Database | Create Database |
+ +----------+----------------------------+
+ | test | CREATE DATABASE `test` |
+ +----------+----------------------------+
+ 1 row in set (0.00 sec)
+ ````
+
+### Keywords
-### Best Practice
+ SHOW, CREATE, DATABASE
+### Best Practice
\ No newline at end of file
diff --git a/new-docs/package-lock.json b/new-docs/package-lock.json
index 8df659c933..9c48990ee0 100644
--- a/new-docs/package-lock.json
+++ b/new-docs/package-lock.json
@@ -17834,13 +17834,15 @@
"version": "1.0.1",
"resolved":
"https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz";,
"integrity":
"sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
- "dev": true
+ "dev": true,
+ "requires": {}
},
"ajv-keywords": {
"version": "3.5.2",
"resolved":
"https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz";,
"integrity":
"sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
- "dev": true
+ "dev": true,
+ "requires": {}
},
"algoliasearch": {
"version": "3.35.1",
@@ -18624,7 +18626,8 @@
"version": "2.1.8",
"resolved":
"https://registry.npmjs.org/bundle-require/-/bundle-require-2.1.8.tgz";,
"integrity":
"sha512-oOEg3A0hy/YzvNWNowtKD0pmhZKseOFweCbgyMqTIih4gRY1nJWsvrOCT27L9NbIyL5jMjTFrAUpGxxpW68Puw==",
- "dev": true
+ "dev": true,
+ "requires": {}
},
"bytes": {
"version": "3.0.0",
@@ -22842,7 +22845,8 @@
"version": "5.3.0",
"resolved":
"https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz";,
"integrity":
"sha512-/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==",
- "dev": true
+ "dev": true,
+ "requires": {}
},
"markdown-it-chain": {
"version": "1.3.0",
diff --git a/new-docs/zh-CN/admin-manual/cluster-management/load-balancing.md
b/new-docs/zh-CN/admin-manual/cluster-management/load-balancing.md
index 2a8ae08c16..93056667d4 100644
--- a/new-docs/zh-CN/admin-manual/cluster-management/load-balancing.md
+++ b/new-docs/zh-CN/admin-manual/cluster-management/load-balancing.md
@@ -27,7 +27,7 @@ under the License.
# 负载均衡
-当部署多个 FE 节点时，用户可以在多个 FE 之上部署负载均衡层来实现 Doris 的高可用。~~
+当部署多个 FE 节点时，用户可以在多个 FE 之上部署负载均衡层来实现 Doris 的高可用。
## 代码实现
diff --git a/new-docs/zh-CN/admin-manual/data-admin/backup.md
b/new-docs/zh-CN/admin-manual/data-admin/backup.md
index fab3d3678e..b100db99f4 100644
--- a/new-docs/zh-CN/admin-manual/data-admin/backup.md
+++ b/new-docs/zh-CN/admin-manual/data-admin/backup.md
@@ -122,7 +122,7 @@ Doris 支持将当前数据以文件的形式，通过 broker 备份到远端存
1 row in set (0.15 sec)
```
-BACKUP的更多用法可参考
[这里](../../sql-manual/sql-reference-v2/Show-Statements/BACKUP.html)。
+BACKUP的更多用法可参考
[这里](../../sql-manual/sql-reference-v2/Data-Definition-Statements/Backup-and-Restore/BACKUP.html)。
## 最佳实践
diff --git a/new-docs/zh-CN/admin-manual/privilege-ldap/user-privilege.md
b/new-docs/zh-CN/admin-manual/privilege-ldap/user-privilege.md
index 40f485d968..9c47df3cb7 100644
--- a/new-docs/zh-CN/admin-manual/privilege-ldap/user-privilege.md
+++ b/new-docs/zh-CN/admin-manual/privilege-ldap/user-privilege.md
@@ -216,4 +216,4 @@ ADMIN_PRIV 和 GRANT_PRIV 权限同时拥有**授予权限**的权限，较为
## 更多帮助
- 关于 权限管理 使用的更多详细语法及最佳实践，请参阅
[GRANTS](../sql-manual/sql-reference-v2/Account-Management-Statements/GRANT.html)
命令手册，你也可以在 MySql 客户端命令行下输入 `HELP GRANTS` 获取更多帮助信息。
\ No newline at end of file
+ 关于 权限管理 使用的更多详细语法及最佳实践，请参阅
[GRANTS](../../sql-manual/sql-reference-v2/Account-Management-Statements/GRANT.html)
命令手册，你也可以在 MySql 客户端命令行下输入 `HELP GRANTS` 获取更多帮助信息。
\ No newline at end of file
diff --git a/new-docs/zh-CN/benchmark/ssb.md b/new-docs/zh-CN/benchmark/ssb.md
index d879138648..81aa19903f 100644
--- a/new-docs/zh-CN/benchmark/ssb.md
+++ b/new-docs/zh-CN/benchmark/ssb.md
@@ -178,5 +178,5 @@ SSB 测试集共 4 组 14 个 SQL。查询语句在 [queries/](https://github.co
>
> 注4：Parallelism 表示查询并发度，通过 `set parallel_fragment_exec_instance_num=8` 设置。
>
- > 注5：Runtime Filter Mode 是 Runtime Filter 的类型，通过 `set
runtime_filter_type="BLOOM_FILTER"` 设置。（[Runtime
Filter](http://doris.incubator.apache.org/master/zh-CN/administrator-guide/runtime-filter.html)
功能对 SSB 测试集效果显著。因为该测试集中，Join 算子右表的数据可以对左表起到很好的过滤作用。你可以尝试通过 `set
runtime_filter_mode=off` 关闭该功能，看看查询延迟的变化。）
+ > 注5：Runtime Filter Mode 是 Runtime Filter 的类型，通过 `set
runtime_filter_type="BLOOM_FILTER"` 设置。（[Runtime
Filter](../advanced/join-optimization/runtime-filter.html) 功能对 SSB
测试集效果显著。因为该测试集中，Join 算子右表的数据可以对左表起到很好的过滤作用。你可以尝试通过 `set
runtime_filter_mode=off` 关闭该功能，看看查询延迟的变化。）
diff --git a/new-docs/zh-CN/data-operate/import/import-scenes/jdbc-load.md
b/new-docs/zh-CN/data-operate/import/import-scenes/jdbc-load.md
index b4e67acc3b..b43aa6f475 100644
--- a/new-docs/zh-CN/data-operate/import/import-scenes/jdbc-load.md
+++ b/new-docs/zh-CN/data-operate/import/import-scenes/jdbc-load.md
@@ -35,7 +35,7 @@ INSERT 语句的使用方式和 MySQL 等数据库中 INSERT 语句的使用方
* INSERT INTO table VALUES(...)
```
-这里我们仅介绍第二种方式。关于 INSERT 命令的详细说明，请参阅 [INSERT]() 命令文档。
+这里我们仅介绍第二种方式。关于 INSERT 命令的详细说明，请参阅
[INSERT](../../../sql-manual/sql-reference-v2/Data-Manipulation-Statements/Manipulation/INSERT.html)
命令文档。
## 单次写入
@@ -160,4 +160,4 @@ public class DorisJDBCDemo {
前面提到，我们建议在使用 INSERT 导入数据时，采用 ”批“ 的方式进行导入，而不是单条插入。
- 同时，我们可以为每次 INSERT 操作设置一个 Label。通过 [Label
机制](./load-atomicity.html#label-机制) 可以保证操作的幂等性和原子性，最终做到数据的不丢不重。关于 INSERT 中
Label 的具体用法，可以参阅
[INSERT](../../../sql-manual/sql-reference-v2/Data-Manipulation-Statements/Manipulation/INSERT.html#insert)
文档。
\ No newline at end of file
+ 同时，我们可以为每次 INSERT 操作设置一个 Label。通过 [Label
机制](./load-atomicity.html#label-机制) 可以保证操作的幂等性和原子性，最终做到数据的不丢不重。关于 INSERT 中
Label 的具体用法，可以参阅
[INSERT](../../../sql-manual/sql-reference-v2/Data-Manipulation-Statements/Manipulation/INSERT.html)
文档。
\ No newline at end of file
diff --git a/new-docs/zh-CN/data-operate/import/import-scenes/kafka-load.md
b/new-docs/zh-CN/data-operate/import/import-scenes/kafka-load.md
index 20436c44d6..53b0c5e5b8 100644
--- a/new-docs/zh-CN/data-operate/import/import-scenes/kafka-load.md
+++ b/new-docs/zh-CN/data-operate/import/import-scenes/kafka-load.md
@@ -121,7 +121,7 @@ Doris 自身能够保证不丢不重的订阅 Kafka 中的消息，即 `Exactly-
### 修改作业属性
-用户可以修改已经创建的作业的部分属性。具体说明请参阅 [ALTER ROUTINE LOAD]() 命令手册。
+用户可以修改已经创建的作业的部分属性。具体说明请参阅 [ALTER ROUTINE
LOAD](../../../sql-manual/sql-reference-v2/Data-Manipulation-Statements/Load/ALTER-ROUTINE-LOAD.html)
命令手册。
### 作业控制
diff --git a/new-docs/zh-CN/data-operate/update-delete/batch-delete-manual.md
b/new-docs/zh-CN/data-operate/update-delete/batch-delete-manual.md
index 2b567a4b9e..2c9eb6eafc 100644
--- a/new-docs/zh-CN/data-operate/update-delete/batch-delete-manual.md
+++ b/new-docs/zh-CN/data-operate/update-delete/batch-delete-manual.md
@@ -77,7 +77,7 @@ Base Compaction 时要将标记为删除的行的删掉，以减少数据占用
`Broker Load` 的写法在 `PROPERTIES` 处设置删除标记列的字段，语法如下：
-```text
+```sql
LOAD LABEL db1.label1
(
[MERGE|APPEND|DELETE] DATA
INFILE("hdfs://abc.com:8888/user/palo/test/ml/file1")
@@ -106,27 +106,27 @@ PROPERTIES
`Routine Load`的写法在 `columns`字段增加映射，映射方式同上，语法如下：
-```text
- CREATE ROUTINE LOAD example_db.test1 ON example_tbl
- [WITH MERGE|APPEND|DELETE]
- COLUMNS(k1, k2, k3, v1, v2, label),
- WHERE k1 > 100 and k2 like "%doris%"
- [DELETE ON label=true]
- PROPERTIES
- (
- "desired_concurrent_number"="3",
- "max_batch_interval" = "20",
- "max_batch_rows" = "300000",
- "max_batch_size" = "209715200",
- "strict_mode" = "false"
- )
- FROM KAFKA
- (
- "kafka_broker_list" = "broker1:9092,broker2:9092,broker3:9092",
- "kafka_topic" = "my_topic",
- "kafka_partitions" = "0,1,2,3",
- "kafka_offsets" = "101,0,0,200"
- );
+```sql
+CREATE ROUTINE LOAD example_db.test1 ON example_tbl
+ [WITH MERGE|APPEND|DELETE]
+ COLUMNS(k1, k2, k3, v1, v2, label),
+ WHERE k1 > 100 and k2 like "%doris%"
+ [DELETE ON label=true]
+ PROPERTIES
+ (
+ "desired_concurrent_number"="3",
+ "max_batch_interval" = "20",
+ "max_batch_rows" = "300000",
+ "max_batch_size" = "209715200",
+ "strict_mode" = "false"
+ )
+ FROM KAFKA
+ (
+ "kafka_broker_list" = "broker1:9092,broker2:9092,broker3:9092",
+ "kafka_topic" = "my_topic",
+ "kafka_partitions" = "0,1,2,3",
+ "kafka_offsets" = "101,0,0,200"
+ );
```
## 注意事项
@@ -138,7 +138,7 @@ PROPERTIES
### 查看是否启用批量删除支持
-```text
+```sql
mysql> SET show_hidden_columns=true;
Query OK, 0 rows affected (0.00 sec)
@@ -158,19 +158,19 @@ mysql> DESC test;
1. 正常导入数据：
-```text
+```bash
curl --location-trusted -u root: -H "column_separator:," -H "columns: siteid,
citycode, username, pv" -H "merge_type: APPEND" -T ~/table1_data
http://127.0.0.1:8130/api/test/table1/_stream_load
```
其中的APPEND 条件可以省略，与下面的语句效果相同：
-```text
+```bash
curl --location-trusted -u root: -H "column_separator:," -H "columns: siteid,
citycode, username, pv" -T ~/table1_data
http://127.0.0.1:8130/api/test/table1/_stream_load
```
2. 将与导入数据key 相同的数据全部删除
-```text
+```bash
curl --location-trusted -u root: -H "column_separator:," -H "columns: siteid,
citycode, username, pv" -H "merge_type: DELETE" -T ~/table1_data
http://127.0.0.1:8130/api/test/table1/_stream_load
```
@@ -205,7 +205,7 @@ curl --location-trusted -u root: -H "column_separator:," -H
"columns: siteid, ci
3. 将导入数据中与`site_id=1` 的行的key列相同的行
-```text
+```bash
curl --location-trusted -u root: -H "column_separator:," -H "columns: siteid,
citycode, username, pv" -H "merge_type: MERGE" -H "delete: siteid=1" -T
~/table1_data http://127.0.0.1:8130/api/test/table1/_stream_load
```
diff --git a/new-docs/zh-CN/data-operate/update-delete/delete-manual.md
b/new-docs/zh-CN/data-operate/update-delete/delete-manual.md
index 0d6efe2ace..3d55d7a0b3 100644
--- a/new-docs/zh-CN/data-operate/update-delete/delete-manual.md
+++ b/new-docs/zh-CN/data-operate/update-delete/delete-manual.md
@@ -40,7 +40,7 @@ Delete命令是一个SQL命令，返回结果是同步的，分为以下几种
如果Delete顺利执行完成并可见，将返回下列结果，`Query OK`表示成功
- ```text
+ ```sql
mysql> delete from test_tbl PARTITION p1 where k1 = 1;
Query OK, 0 rows affected (0.04 sec)
{'label':'delete_e7830c72-eb14-4cb9-bbb6-eebd4511d251', 'status':'VISIBLE',
'txnId':'4005'}
@@ -50,7 +50,7 @@ Delete命令是一个SQL命令，返回结果是同步的，分为以下几种
Doris的事务提交分为两步：提交和发布版本，只有完成了发布版本步骤，结果才对用户是可见的。若已经提交成功了，那么就可以认为最终一定会发布成功，Doris会尝试在提交完后等待发布一段时间，如果超时后即使发布版本还未完成也会优先返回给用户，提示用户提交已经完成。若如果Delete已经提交并执行，但是仍未发布版本和可见，将返回下列结果
- ```text
+ ```sql
mysql> delete from test_tbl PARTITION p1 where k1 = 1;
Query OK, 0 rows affected (0.04 sec)
{'label':'delete_e7830c72-eb14-4cb9-bbb6-eebd4511d251',
'status':'COMMITTED', 'txnId':'4005', 'err':'delete job is committed but may be
taking effect later' }
@@ -72,7 +72,7 @@ Delete命令是一个SQL命令，返回结果是同步的，分为以下几种
如果Delete语句没有提交成功，将会被Doris自动中止，返回下列结果
- ```text
+ ```sql
mysql> delete from test_tbl partition p1 where k1 > 80;
ERROR 1064 (HY000): errCode = 2, detailMessage = {错误原因}
```
@@ -81,7 +81,7 @@ Delete命令是一个SQL命令，返回结果是同步的，分为以下几种
比如说一个超时的删除，将会返回timeout时间和未完成的`(tablet=replica)`
- ```text
+ ```sql
mysql> delete from test_tbl partition p1 where k1 > 80;
ERROR 1064 (HY000): errCode = 2, detailMessage = failed to delete replicas
from job: 4005, Unfinished replicas:10000=60000, 10001=60000, 10002=60000
```
@@ -129,13 +129,13 @@ Delete命令是一个SQL命令，返回结果是同步的，分为以下几种
语法如下
-```text
+```sql
SHOW DELETE [FROM db_name]
```
使用示例
-```text
+```sql
mysql> show delete from test_db;
+-----------+---------------+---------------------+-----------------+----------+
| TableName | PartitionName | CreateTime | DeleteCondition | State
|
diff --git
a/new-docs/zh-CN/data-operate/update-delete/sequence-column-manual.md
b/new-docs/zh-CN/data-operate/update-delete/sequence-column-manual.md
index aba3eee4ac..d5c62205a0 100644
--- a/new-docs/zh-CN/data-operate/update-delete/sequence-column-manual.md
+++ b/new-docs/zh-CN/data-operate/update-delete/sequence-column-manual.md
@@ -78,7 +78,7 @@ sequence_type用来指定sequence列的类型，可以为整型和时间类型
stream load
的写法是在header中的`function_column.sequence_col`字段添加隐藏列对应的source_sequence的映射， 示例
-```text
+```bash
curl --location-trusted -u root -H "columns: k1,k2,source_sequence,v1,v2" -H
"function_column.sequence_col: source_sequence" -T testData
http://host:port/api/testDb/testTbl/_stream_load
```
@@ -86,7 +86,7 @@ curl --location-trusted -u root -H "columns:
k1,k2,source_sequence,v1,v2" -H "fu
在`ORDER BY` 处设置隐藏列映射的source_sequence字段
-```text
+```sql
LOAD LABEL db1.label1
(
DATA INFILE("hdfs://host:port/user/data/*/test.txt")
@@ -110,7 +110,7 @@ PROPERTIES
映射方式同上，示例如下
-```text
+```sql
CREATE ROUTINE LOAD example_db.test1 ON example_tbl
[WITH MERGE|APPEND|DELETE]
COLUMNS(k1, k2, source_sequence, v1, v2),
@@ -145,7 +145,7 @@ PROPERTIES
表结构如下：
-```text
+```sql
MySQL > desc test_table;
+-------------+--------------+------+-------+---------+---------+
| Field | Type | Null | Key | Default | Extra |
@@ -173,13 +173,13 @@ MySQL > desc test_table;
此处以stream load为例， 将sequence column映射为modify_date列
-```text
+```bash
curl --location-trusted -u root: -H "function_column.sequence_col:
modify_date" -T testData http://host:port/api/test/test_table/_stream_load
```
结果为
-```text
+```sql
MySQL > select * from test_table;
+---------+------------+----------+-------------+---------+
| user_id | date | group_id | modify_date | keyword |
@@ -201,7 +201,7 @@ MySQL > select * from test_table;
查询数据
-```text
+```sql
MySQL [test]> select * from test_table;
+---------+------------+----------+-------------+---------+
| user_id | date | group_id | modify_date | keyword |
@@ -219,7 +219,7 @@ MySQL [test]> select * from test_table;
查询数据
-```text
+```sql
MySQL [test]> select * from test_table;
+---------+------------+----------+-------------+---------+
| user_id | date | group_id | modify_date | keyword |
diff --git a/new-docs/zh-CN/data-operate/update-delete/update.md
b/new-docs/zh-CN/data-operate/update-delete/update.md
index 88d61c194b..853c931ffc 100644
--- a/new-docs/zh-CN/data-operate/update-delete/update.md
+++ b/new-docs/zh-CN/data-operate/update-delete/update.md
@@ -63,7 +63,7 @@ Update 语句的性能和待更新的行数以及 condition 的检索效率密
由于 Doris 目前支持的是行更新，并且采用的是读取后再写入的两步操作，则如果 Update 语句和其他导入或 Delete
语句刚好修改的是同一行时，存在不确定的数据结果。
-所以用户在使用的时候，一定要注意***用户侧自己***进行 Update 语句和其他 DML 语句的并发控制。
+所以用户在使用的时候，一定要注意**用户侧自己**进行 Update 语句和其他 DML 语句的并发控制。
## 使用示例
diff --git a/new-docs/zh-CN/ecosystem/external-table/odbc-of-doris.md
b/new-docs/zh-CN/ecosystem/external-table/odbc-of-doris.md
index c06086d5a9..26153afb44 100644
--- a/new-docs/zh-CN/ecosystem/external-table/odbc-of-doris.md
+++ b/new-docs/zh-CN/ecosystem/external-table/odbc-of-doris.md
@@ -70,7 +70,7 @@ PROPERTIES (
```
#### 2. 通过ODBC_Resource来创建ODBC外表 (推荐使用的方式)
-```
+```sql
CREATE EXTERNAL RESOURCE `oracle_odbc`
PROPERTIES (
"type" = "odbc_catalog",
@@ -323,7 +323,7 @@ sudo alien -i
oracle-instantclient19.13-sqlplus-19.13.0.0.0-2.x86_64.rpm
适用于少数据量的同步
-例如Mysql中一张表有100万数据，想同步到doris，就可以采用ODBC的方式将数据映射过来，在使用[insert
into](http://localhost:8080/zh-CN/data-operate/import/import-way/insert-into-manual.html)
方式将数据同步到Doris中，如果想同步大批量数据，可以分批次使用[insert
into](http://localhost:8080/zh-CN/data-operate/import/import-way/insert-into-manual.html)同步（不建议使用）
+例如Mysql中一张表有100万数据，想同步到doris，就可以采用ODBC的方式将数据映射过来，在使用[insert
into](../../data-operate/import/import-way/insert-into-manual.html)
方式将数据同步到Doris中，如果想同步大批量数据，可以分批次使用[insert
into](../../data-operate/import/import-way/insert-into-manual.html)同步（不建议使用）
## Q&A
diff --git a/new-docs/zh-CN/faq/install-faq.md
b/new-docs/zh-CN/faq/install-faq.md
index d70835bcd3..2d33ec566c 100644
--- a/new-docs/zh-CN/faq/install-faq.md
+++ b/new-docs/zh-CN/faq/install-faq.md
@@ -81,7 +81,7 @@ Observer 角色和这个单词的含义一样，仅仅作为观察者来同步
3. 使用API手动迁移数据
- Doris提供了[HTTP
API](../advanced/http-actions/tablet-migration-action.html)，可以手动指定一个磁盘上的数据分片迁移到另一个磁盘上。
+ Doris提供了[HTTP
API](../admin-manual/http-actions/tablet-migration-action.html)，可以手动指定一个磁盘上的数据分片迁移到另一个磁盘上。
### Q5. 如何正确阅读 FE/BE 日志?
diff --git a/new-docs/zh-CN/get-starting/get-starting.md
b/new-docs/zh-CN/get-starting/get-starting.md
index 23cd882664..2cc3a9f579 100644
--- a/new-docs/zh-CN/get-starting/get-starting.md
+++ b/new-docs/zh-CN/get-starting/get-starting.md
@@ -63,10 +63,10 @@ under the License.
2. 下载二进制包/自主编译 FE / BE 文件
```shell
- wget https://doris.apache.org/apache-doris-release/要部署的版本
+ wget https://dist.apache.org/repos/dist/dev/incubator/doris/要部署的版本
wget https://palo-cloud-repo-bd.bd.bcebos.com/baidu-doris-release/要部署的版本
# 例如如下链接
- wget https://doris.apache.org/release/doris-1.0.0.tar.gz
+ wget
https://dist.apache.org/repos/dist/dev/incubator/doris/1.0/1.0.0-rc03/apache-doris-1.0.0-incubating-bin.tar.gz
wget
https://palo-cloud-repo-bd.bd.bcebos.com/baidu-doris-release/PALO-1.0.0-preview2-no-avx2-binary.tar.gz
```
@@ -75,7 +75,7 @@ under the License.
```shell
tar -zxvf 下载好的二进制压缩包
# 例如
- tar -zxvf PALO-1.0.0-preview2-no-avx2-binary.tar.gz
+ tar -zxvf apache-doris-1.0.0-incubating-bin.tar.gz
```
4. 迁移解压缩后的程序文件至指定目录并重命名
@@ -84,7 +84,7 @@ under the License.
mv 解压后的根目录 目标路径
cd 目标路径
# 例如
- mv PALO-1.0.0-preview2-no-avx2-binary /opt/doris
+ mv apache-doris-1.0.0-incubating-bin /opt/doris
cd /opt/doris
```
diff --git
a/new-docs/zh-CN/sql-manual/sql-reference-v2/Data-Definition-Statements/Backup-and-Restore/RECOVER.md
b/new-docs/zh-CN/sql-manual/sql-reference-v2/Data-Definition-Statements/Backup-and-Restore/RECOVER.md
index 15bd08e023..6d34b87ad1 100644
---
a/new-docs/zh-CN/sql-manual/sql-reference-v2/Data-Definition-Statements/Backup-and-Restore/RECOVER.md
+++
b/new-docs/zh-CN/sql-manual/sql-reference-v2/Data-Definition-Statements/Backup-and-Restore/RECOVER.md
@@ -1,6 +1,6 @@
---
{
- "title": "BACKUP",
+ "title": "RECOVER",
"language": "zh-CN"
}
---
diff --git
a/new-docs/zh-CN/sql-manual/sql-reference-v2/Data-Manipulation-Statements/Manipulation/INSERT.md
b/new-docs/zh-CN/sql-manual/sql-reference-v2/Data-Manipulation-Statements/Manipulation/INSERT.md
index f5efb560ac..02a8acaae6 100644
---
a/new-docs/zh-CN/sql-manual/sql-reference-v2/Data-Manipulation-Statements/Manipulation/INSERT.md
+++
b/new-docs/zh-CN/sql-manual/sql-reference-v2/Data-Manipulation-Statements/Manipulation/INSERT.md
@@ -32,7 +32,7 @@ INSERT
### Description
-改语句是完成数据插入操作。
+该语句是完成数据插入操作。
```sql
INSERT INTO table_name
diff --git
a/new-docs/zh-CN/sql-manual/sql-reference-v2/Show-Statements/SHOW-COLUMNS.md
b/new-docs/zh-CN/sql-manual/sql-reference-v2/Show-Statements/SHOW-COLUMNS.md
index bc218aaf69..b9155d9222 100644
--- a/new-docs/zh-CN/sql-manual/sql-reference-v2/Show-Statements/SHOW-COLUMNS.md
+++ b/new-docs/zh-CN/sql-manual/sql-reference-v2/Show-Statements/SHOW-COLUMNS.md
@@ -36,9 +36,9 @@ SHOW FULL COLUMNS
语法：
- ```sql
- SHOW FULL COLUMNS FROM tbl;
- ```
+```sql
+SHOW FULL COLUMNS FROM tbl;
+```
### Example
diff --git
a/new-docs/zh-CN/sql-manual/sql-reference-v2/Show-Statements/SHOW-CREATE-DATABASE.md
b/new-docs/zh-CN/sql-manual/sql-reference-v2/Show-Statements/SHOW-CREATE-DATABASE.md
index f2c2f2d89b..e46b94a2bd 100644
---
a/new-docs/zh-CN/sql-manual/sql-reference-v2/Show-Statements/SHOW-CREATE-DATABASE.md
+++
b/new-docs/zh-CN/sql-manual/sql-reference-v2/Show-Statements/SHOW-CREATE-DATABASE.md
@@ -32,8 +32,32 @@ SHOW CREATE DATABASE
### Description
+该语句查看doris数据库的创建情况。
+
+语法：
+
+```sql
+SHOW CREATE DATABASE db_name;
+```
+
+说明：
+
+- `db_name`: 为doris存在的数据库名称。
+
### Example
+1. 查看doris中test数据库的创建情况
+
+ ```sql
+ mysql> SHOW CREATE DATABASE test;
+ +----------+------------------------+
+ | Database | Create Database |
+ +----------+------------------------+
+ | test | CREATE DATABASE `test` |
+ +----------+------------------------+
+ 1 row in set (0.00 sec)
+ ```
+
### Keywords
SHOW, CREATE, DATABASE
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
