You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by ji...@apache.org on 2022/10/09 12:02:55 UTC
[doris] branch master updated: [typo](docs)fix docs 404 url (#13157)
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 b9516b50c1 [typo](docs)fix docs 404 url (#13157)
b9516b50c1 is described below
commit b9516b50c11d11ba934140cb20b75e555a0468d6
Author: zy-kkk <zh...@qq.com>
AuthorDate: Sun Oct 9 20:02:48 2022 +0800
[typo](docs)fix docs 404 url (#13157)
* fix docs 404 url
---
docs/en/docs/ecosystem/logstash.md | 4 +-
docs/en/docs/ecosystem/udf/contribute-udf.md | 4 +-
docs/en/docs/faq/install-faq.md | 4 -
.../Alter/ALTER-TABLE-ROLLUP.md | 1 -
.../Drop/DROP-DATABASE.md | 2 +-
.../SHOW-ALTER-TABLE-MATERIALIZED-VIEW.md | 120 +++++++++++++++++++++
.../sql-reference/Show-Statements/SHOW-STATUS.md | 17 ++-
docs/zh-CN/docs/ecosystem/logstash.md | 2 +-
.../Alter/ALTER-TABLE-PARTITION.md | 2 +-
.../Alter/ALTER-TABLE-ROLLUP.md | 2 +-
.../Drop/DROP-DATABASE.md | 2 +-
.../SHOW-ALTER-TABLE-MATERIALIZED-VIEW.md | 2 +-
12 files changed, 137 insertions(+), 25 deletions(-)
diff --git a/docs/en/docs/ecosystem/logstash.md b/docs/en/docs/ecosystem/logstash.md
index d5dfe17a41..c6ab151d1f 100644
--- a/docs/en/docs/ecosystem/logstash.md
+++ b/docs/en/docs/ecosystem/logstash.md
@@ -28,9 +28,9 @@ under the License.
This plugin is used to output data to Doris for logstash, use the HTTP protocol to interact with the Doris FE Http interface, and import data through Doris's stream load.
-[Learn more about Doris Stream Load ](../data-operate/import/import-way/stream-load-manual.html)
+[Learn more about Doris Stream Load ](../data-operate/import/import-way/stream-load-manual)
-[Learn more about Doris](../)
+[Learn more about Doris](/)
## Install and compile
diff --git a/docs/en/docs/ecosystem/udf/contribute-udf.md b/docs/en/docs/ecosystem/udf/contribute-udf.md
index 075bd41a5f..c7c01035ae 100644
--- a/docs/en/docs/ecosystem/udf/contribute-udf.md
+++ b/docs/en/docs/ecosystem/udf/contribute-udf.md
@@ -14,7 +14,7 @@ to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
@@ -121,4 +121,4 @@ The user manual needs to include: UDF function definition description, applicabl
When you meet the conditions and prepare the code, you can contribute UDF to the Doris community after the document. Simply submit the request (PR) on [Github](https://github.com/apache/incubator-doris). See the specific submission method: [Pull Request (PR)](https://help.github.com/articles/about-pull-requests/).
-Finally, when the PR assessment is passed and merged. Congratulations, your UDF becomes a third-party UDF supported by Doris. You can check it out in the ecological expansion section of [Doris official website](/en)~.
+Finally, when the PR assessment is passed and merged. Congratulations, your UDF becomes a third-party UDF supported by Doris. You can check it out in the ecological expansion section of [Doris official website](/)~.
diff --git a/docs/en/docs/faq/install-faq.md b/docs/en/docs/faq/install-faq.md
index a8f805e9c2..b8f5f88537 100644
--- a/docs/en/docs/faq/install-faq.md
+++ b/docs/en/docs/faq/install-faq.md
@@ -155,10 +155,6 @@ In many cases, we need to troubleshoot problems through logs. The format and vie
Logs starting with F are Fatal logs. For example, F0916 , indicating the Fatal log on September 16th. Fatal logs usually indicate a program assertion error, and an assertion error will directly cause the process to exit (indicating a bug in the program). Welcome to the WeChat group, github discussion or dev mail group for help.
- 4. Minidump(removed)
-
- Mindump is a function added after Doris version 0.15. For details, please refer to [document](https://doris.apache.org/zh-CN/developer-guide/minidump.html).
-
2. FE
FE is a java process, and the robustness is better than the C/C++ program. Usually the reason for FE to hang up may be OOM (Out-of-Memory) or metadata write failure. These errors usually have an error stack in fe.log or fe.out. Further investigation is required based on the error stack information.
diff --git a/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-ROLLUP.md b/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-ROLLUP.md
index 2991aa24b4..596e7cfcc5 100644
--- a/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-ROLLUP.md
+++ b/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-ROLLUP.md
@@ -138,4 +138,3 @@ ALTER, TABLE, ROLLUP, ALTER TABLE
```
### Best Practice
-
diff --git a/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-DATABASE.md b/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-DATABASE.md
index e0877d0b83..ef0ab3273d 100644
--- a/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-DATABASE.md
+++ b/docs/en/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-DATABASE.md
@@ -41,7 +41,7 @@ DROP DATABASE [IF EXISTS] db_name [FORCE];
illustrate:
-- During the execution of DROP DATABASE, the deleted database can be recovered through the RECOVER statement. See the [RECOVER](../../Data-Definition-Statements/Backup-and-Restore/RECOVER.md) statement for details
+- During the execution of DROP DATABASE, the deleted database can be recovered through the RECOVER statement. See the [RECOVER](../../Database-Administration-Statements/RECOVER) statement for details
- If you execute DROP DATABASE FORCE, the system will not check the database for unfinished transactions, the database will be deleted directly and cannot be recovered, this operation is generally not recommended
### Example
diff --git a/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-ALTER-TABLE-MATERIALIZED-VIEW.md b/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-ALTER-TABLE-MATERIALIZED-VIEW.md
index e69de29bb2..7a75f9a94a 100644
--- a/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-ALTER-TABLE-MATERIALIZED-VIEW.md
+++ b/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-ALTER-TABLE-MATERIALIZED-VIEW.md
@@ -0,0 +1,120 @@
+---
+{
+ "title": "SHOW ALTER TABLE MATERIALIZED VIEW",
+ "language": "en"
+}
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+## SHOW ALTER TABLE MATERIALIZED VIEW
+
+### Name
+
+SHOW ALTER TABLE MATERIALIZED VIEW
+
+### Description
+
+This command is used to view the execution of the Create Materialized View job submitted through the [CREATE-MATERIALIZED-VIEW](../Data-Definition-Statements/Create/CREATE-MATERIALIZED-VIEW) statement.
+
+> This statement is equivalent to `SHOW ALTER TABLE ROLLUP`;
+
+```sql
+SHOW ALTER TABLE MATERIALIZED VIEW
+[FROM database]
+[WHERE]
+[ORDER BY]
+[LIMIT OFFSET]
+````
+
+- database: View jobs under the specified database. If not specified, the current database is used.
+- WHERE: You can filter the result column, currently only the following columns are supported:
+ - TableName: Only equal value filtering is supported.
+ - State: Only supports equivalent filtering.
+ - Createtime/FinishTime: Support =, >=, <=, >, <, !=
+- ORDER BY: The result set can be sorted by any column.
+- LIMIT: Use ORDER BY to perform page-turning query.
+
+Return result description:
+
+```sql
+mysql> show alter table materialized view\G
+**************************** 1. row ******************** ******
+ JobId: 11001
+ TableName: tbl1
+ CreateTime: 2020-12-23 10:41:00
+ FinishTime: NULL
+ BaseIndexName: tbl1
+RollupIndexName: r1
+ RollupId: 11002
+ TransactionId: 5070
+ State: WAITING_TXN
+ Msg:
+ Progress: NULL
+ Timeout: 86400
+1 row in set (0.00 sec)
+````
+
+- `JobId`: Job unique ID.
+
+- `TableName`: base table name
+
+- `CreateTime/FinishTime`: Job creation time and end time.
+
+- `BaseIndexName/RollupIndexName`: Base table name and materialized view name.
+
+- `RollupId`: The unique ID of the materialized view.
+
+- `TransactionId`: See the description of the State field.
+
+- `State`: job status.
+
+ - PENDING: The job is in preparation.
+
+ - WAITING_TXN:
+
+ Before officially starting to generate materialized view data, it will wait for the current running import transaction on this table to complete. And the `TransactionId` field is the current waiting transaction ID. When all previous imports for this ID are complete, the job will actually start.
+
+ - RUNNING: The job is running.
+
+ - FINISHED: The job ran successfully.
+
+ - CANCELLED: The job failed to run.
+
+- `Msg`: error message
+
+- `Progress`: job progress. The progress here means `completed tablets/total tablets`. Materialized views are created at tablet granularity.
+
+- `Timeout`: Job timeout, in seconds.
+
+### Example
+
+1. View the materialized view jobs under the database example_db
+
+ ```sql
+ SHOW ALTER TABLE MATERIALIZED VIEW FROM example_db;
+ ````
+
+### Keywords
+
+ SHOW, ALTER, TABLE, MATERIALIZED, VIEW
+
+### Best Practice
+
diff --git a/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-STATUS.md b/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-STATUS.md
index 35a2d099fa..7b105a7034 100644
--- a/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-STATUS.md
+++ b/docs/en/docs/sql-manual/sql-reference/Show-Statements/SHOW-STATUS.md
@@ -1,6 +1,6 @@
---
{
- "title": "SHOW ALTER TABLE MATERIALIZED VIEW",
+ "title": "SHOW-STATUS",
"language": "en"
}
---
@@ -24,14 +24,15 @@ specific language governing permissions and limitations
under the License.
-->
-## SHOW ALTER TABLE MATERIALIZED VIEW
+## SHOW-STATUS
### Name
-SHOW ALTER TABLE MATERIALIZED VIEW
+SHOW STATUS
### Description
+<<<<<<< HEAD
This command is used to view the execution of the Create Materialized View job submitted through the [CREATE-MATERIALIZED-VIEW](../../Data-Definition-Statements/Create/CREATE-MATERIALIZED-VIEW) statement.
> This statement is equivalent to `SHOW ALTER TABLE ROLLUP`;
@@ -104,17 +105,13 @@ RollupIndexName: r1
- `Timeout`: Job timeout, in seconds.
+=======
+>>>>>>> 1c59e4cf7 (fix docs 404 url)
### Example
-1. View the materialized view jobs under the database example_db
-
- ```sql
- SHOW ALTER TABLE MATERIALIZED VIEW FROM example_db;
- ````
-
### Keywords
- SHOW, ALTER, TABLE, MATERIALIZED, VIEW
+ SHOW, STATUS
### Best Practice
diff --git a/docs/zh-CN/docs/ecosystem/logstash.md b/docs/zh-CN/docs/ecosystem/logstash.md
index bb16bc4084..2a6b98fb2b 100644
--- a/docs/zh-CN/docs/ecosystem/logstash.md
+++ b/docs/zh-CN/docs/ecosystem/logstash.md
@@ -30,7 +30,7 @@ under the License.
[了解Doris Stream Load ](../data-operate/import/import-way/stream-load-manual.md)
-[了解更多关于Doris](../)
+[了解更多关于Doris](/zh-CN)
## 安装和编译
diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-PARTITION.md b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-PARTITION.md
index 33776d02ad..67ce90fe86 100644
--- a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-PARTITION.md
+++ b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-PARTITION.md
@@ -62,7 +62,7 @@ partition_desc ["key"="value"]
- 分区为左闭右开区间，如果用户仅指定右边界，系统会自动确定左边界
- 如果没有指定分桶方式，则自动使用建表使用的分桶方式和分桶数。
- 如指定分桶方式，只能修改分桶数，不可修改分桶方式或分桶列。如果指定了分桶方式，但是没有指定分桶数，则分桶数会使用默认值10，不会使用建表时指定的分桶数。如果要指定分桶数，则必须指定分桶方式。
-- ["key"="value"] 部分可以设置分区的一些属性，具体说明见 [CREATE TABLE](./sql-manual/sql-reference/Data-Definition-Statements/Create/CREATE-TABLE.md)
+- ["key"="value"] 部分可以设置分区的一些属性，具体说明见 [CREATE TABLE](../Create/CREATE-TABLE)
- 如果建表时用户未显式创建Partition,则不支持通过ALTER的方式增加分区
2. 删除分区
diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-ROLLUP.md b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-ROLLUP.md
index 05ec959bd7..cd72797b57 100644
--- a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-ROLLUP.md
+++ b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-ROLLUP.md
@@ -68,7 +68,7 @@ ADD ROLLUP [rollup_name (column_name1, column_name2, ...)
- 如果没有指定 from_index_name，则默认从 base index 创建
- rollup 表中的列必须是 from_index 中已有的列
-- 在 properties 中，可以指定存储格式。具体请参阅 [CREATE TABLE](../Create/CREATE-TABLE.html#create-table)
+- 在 properties 中，可以指定存储格式。具体请参阅 [CREATE TABLE](../Create/CREATE-TABLE)
3. 删除 rollup index
diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-DATABASE.md b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-DATABASE.md
index aeeb89f05b..c4f8cad185 100644
--- a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-DATABASE.md
+++ b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Definition-Statements/Drop/DROP-DATABASE.md
@@ -41,7 +41,7 @@ DROP DATABASE [IF EXISTS] db_name [FORCE];
说明：
-- 执行 DROP DATABASE 一段时间内，可以通过 RECOVER 语句恢复被删除的数据库。详见 [RECOVER](../../Data-Definition-Statements/Backup-and-Restore/RECOVER.md) 语句
+- 执行 DROP DATABASE 一段时间内，可以通过 RECOVER 语句恢复被删除的数据库。详见 [RECOVER](../../Database-Administration-Statements/RECOVER) 语句
- 如果执行 DROP DATABASE FORCE，则系统不会检查该数据库是否存在未完成的事务，数据库将直接被删除并且不能被恢复，一般不建议执行此操作
### Example
diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-ALTER-TABLE-MATERIALIZED-VIEW.md b/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-ALTER-TABLE-MATERIALIZED-VIEW.md
index 62ee04bd96..8b7806de57 100644
--- a/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-ALTER-TABLE-MATERIALIZED-VIEW.md
+++ b/docs/zh-CN/docs/sql-manual/sql-reference/Show-Statements/SHOW-ALTER-TABLE-MATERIALIZED-VIEW.md
@@ -32,7 +32,7 @@ SHOW ALTER TABLE MATERIALIZED VIEW
### Description
-该命令用于查看通过 [CREATE-MATERIALIZED-VIEW](../../sql-manual/sql-reference/Data-Definition-Statements/Create/CREATE-MATERIALIZED-VIEW.md) 语句提交的创建物化视图作业的执行情况。
+该命令用于查看通过 [CREATE-MATERIALIZED-VIEW](../Data-Definition-Statements/Create/CREATE-MATERIALIZED-VIEW) 语句提交的创建物化视图作业的执行情况。
> 该语句等同于 `SHOW ALTER TABLE ROLLUP`;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org