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 b7e22f72c9 fix-doc (#11756) b7e22f72c9 is described below commit b7e22f72c95417bedf70ac0a89d8b60c84fc46f9 Author: Liqf <109049295+lemonlit...@users.noreply.github.com> AuthorDate: Wed Aug 17 11:49:48 2022 +0800 fix-doc (#11756) Document typo update --- docs/en/docs/admin-manual/cluster-management/upgrade.md | 8 ++++---- docs/en/docs/install/install-deploy.md | 4 ++-- .../sql-functions/window-functions/WINDOW-FUNCTION-COUNT.md | 2 +- .../sql-reference/Data-Definition-Statements/Drop/DROP-INDEX.md | 2 +- docs/zh-CN/docs/admin-manual/cluster-management/upgrade.md | 2 +- .../sql-functions/window-functions/WINDOW-FUNCTION-COUNT.md | 2 +- .../sql-reference/Data-Definition-Statements/Drop/DROP-INDEX.md | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/en/docs/admin-manual/cluster-management/upgrade.md b/docs/en/docs/admin-manual/cluster-management/upgrade.md index 34eaada8bb..450867bcca 100644 --- a/docs/en/docs/admin-manual/cluster-management/upgrade.md +++ b/docs/en/docs/admin-manual/cluster-management/upgrade.md @@ -68,10 +68,10 @@ Doris can upgrade smoothly by rolling upgrades. The following steps are recommen 1. Deploy a test FE process (It is recommended to use your own local development machine, or BE node. If it is on the Follower or Observer node, you need to stop the started process, but it is not recommended to test on the Follower or Observer node) using the new version alone. 2. Modify the FE configuration file fe.conf for testing and set all ports to **different from online**. 3. Add configuration in fe.conf: cluster_id=123456 -4. Add the configuration in fe.conf: metadatafailure_recovery=true -5. Copy the metadata directory palo-meta of the online environment Master FE to the test environment -6. Modify the cluster_id in the palo-meta/image/VERSION file copied into the test environment to 123456 (that is, the same as in Step 3) -7. "27979;" "35797;" "3681616;" sh bin /start fe.sh "21551;" FE +4. Add configuration in fe.conf: metadata_failure_recovery=true +5. Copy the metadata directory doris-meta of the online environment master Fe to the test environment +6.The cluster_ID where copy to the doris-meta/image/VERSION file in the test environment is modified to 123456 (that is, the same as in Step 3) +7. In the test environment,running sh sh bin/start_fe.sh,start FE. 8. Observe whether the start-up is successful through FE log fe.log. 9. If the startup is successful, run sh bin/stop_fe.sh to stop the FE process of the test environment. 10. **The purpose of the above 2-6 steps is to prevent the FE of the test environment from being misconnected to the online environment after it starts.** diff --git a/docs/en/docs/install/install-deploy.md b/docs/en/docs/install/install-deploy.md index 97eed74871..33eaf14efd 100644 --- a/docs/en/docs/install/install-deploy.md +++ b/docs/en/docs/install/install-deploy.md @@ -77,14 +77,14 @@ Here we recommend using the ext4 file system. When installing the operating syst | Module | CPU | Memory | Disk | Network | Instance Number| |---|---|---|---|---|---| | Frontend | 8 core + | 8GB + | SSD or SATA, 10GB + * | Gigabit Network Card | 1| -| Backend | 8-core + | 16GB + | SSD or SATA, 50GB + * | Gigabit Network Card | 1-3*| +| Backend | 8 core + | 16GB + | SSD or SATA, 50GB + * | Gigabit Network Card | 1-3*| #### Production environment | Module | CPU | Memory | Disk | Network | Number of Instances (Minimum Requirements)| |---|---|---|---|---|---| | Frontend | 16 core + | 64GB + | SSD or RAID card, 100GB + * | 10,000 Mbp network card | 1-5*| -| Backend | 16 core + | 64GB + | SSD or SATA, 100G + * | 10-100 Mbp network card*| +| Backend | 16 core + | 64GB + | SSD or SATA, 100G + * | 10-100 Mbp network card | 10-100 * | > Note 1: > diff --git a/docs/en/docs/sql-manual/sql-functions/window-functions/WINDOW-FUNCTION-COUNT.md b/docs/en/docs/sql-manual/sql-functions/window-functions/WINDOW-FUNCTION-COUNT.md index 21d7cb25f8..b0a0a14d89 100644 --- a/docs/en/docs/sql-manual/sql-functions/window-functions/WINDOW-FUNCTION-COUNT.md +++ b/docs/en/docs/sql-manual/sql-functions/window-functions/WINDOW-FUNCTION-COUNT.md @@ -17,7 +17,7 @@ Unless required by applicable law or agreed to in writing, software distributed Count the number of occurrences of data in the window ```sql -COUNT([DISTINCT | ALL] expression) [OVER (analytic_clause)] +COUNT(expression) [OVER (analytic_clause)] ``` ### example diff --git a/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-INDEX.md b/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-INDEX.md index f491b1004f..ae4088f730 100644 --- a/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-INDEX.md +++ b/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-INDEX.md @@ -44,7 +44,7 @@ DROP INDEX [IF EXISTS] index_name ON [db_name.]table_name; 1. Delete the index ```sql - CREATE INDEX [IF NOT EXISTS] index_name ON table1 ; + DROP INDEX [IF NOT EXISTS] index_name ON table1 ; ```` ### Keywords diff --git a/docs/zh-CN/docs/admin-manual/cluster-management/upgrade.md b/docs/zh-CN/docs/admin-manual/cluster-management/upgrade.md index 376bf5ece2..b125eb34a1 100644 --- a/docs/zh-CN/docs/admin-manual/cluster-management/upgrade.md +++ b/docs/zh-CN/docs/admin-manual/cluster-management/upgrade.md @@ -68,7 +68,7 @@ Doris 可以通过滚动升级的方式,平滑进行升级。建议按照以 1. 单独使用新版本部署一个测试用的 FE 进程(建议在自己本地的开发机,或者BE节点。如果在Follower或者Observer节点上,需要停止启动的进程,但是不建议在Follower或者Observer节点上测试)。 2. 修改测试用的 FE 的配置文件 fe.conf,将所有端口设置为**与线上不同**。 3. 在 fe.conf 添加配置:cluster_id=123456 -4. 在 fe.conf 添加配置:metadata\_failure_recovery=true +4. 在 fe.conf 添加配置:metadata_failure_recovery=true 5. 拷贝线上环境 Master FE 的元数据目录 doris-meta 到测试环境 6. 将拷贝到测试环境中的 doris-meta/image/VERSION 文件中的 cluster_id 修改为 123456(即与第3步中相同) 7. 在测试环境中,运行 sh bin/start_fe.sh 启动 FE diff --git a/docs/zh-CN/docs/sql-manual/sql-functions/window-functions/WINDOW-FUNCTION-COUNT.md b/docs/zh-CN/docs/sql-manual/sql-functions/window-functions/WINDOW-FUNCTION-COUNT.md index e09e619130..c974508c85 100644 --- a/docs/zh-CN/docs/sql-manual/sql-functions/window-functions/WINDOW-FUNCTION-COUNT.md +++ b/docs/zh-CN/docs/sql-manual/sql-functions/window-functions/WINDOW-FUNCTION-COUNT.md @@ -17,7 +17,7 @@ Unless required by applicable law or agreed to in writing, software distributed 计算窗口内数据出现次数 ```sql -COUNT([DISTINCT | ALL] expression) [OVER (analytic_clause)] +COUNT(expression) [OVER (analytic_clause)] ``` ### example diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-INDEX.md b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-INDEX.md index 8521778467..098a30184f 100644 --- a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-INDEX.md +++ b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-INDEX.md @@ -44,7 +44,7 @@ DROP INDEX [IF EXISTS] index_name ON [db_name.]table_name; 1. 删除索引 ```sql - CREATE INDEX [IF NOT EXISTS] index_name ON table1 ; + DROP INDEX [IF NOT EXISTS] index_name ON table1 ; ``` ### Keywords --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org