You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2020/04/23 07:49:57 UTC
[incubator-doris-website] branch asf-site updated: update doc
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-doris-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new d721daf update doc
d721daf is described below
commit d721daf8b67479327a6b04320ade4f95a833178f
Author: morningman <mo...@163.com>
AuthorDate: Thu Apr 23 15:48:19 2020 +0800
update doc
---
.../alter-table/alter-table-temp-partition.md.txt | 2 +-
.../load-data/delete-manual.md.txt | 176 +++++++++
.../cn/administrator-guide/load-data/index.rst.txt | 1 +
.../cn/administrator-guide/segment-v2-usage.md.txt | 201 +++++-----
.../cn/getting-started/data-partition.md.txt | 2 +-
.../Administration/SHOW INDEX.md.txt | 4 +-
.../Data Definition/ALTER DATABASE.md.txt | 9 +-
.../Data Manipulation/ROUTINE LOAD.md.txt | 6 +-
.../Data Manipulation/SHOW DATA.md.txt | 10 +-
.../sql-statements/Data Types/BOOLEAN.md.txt | 2 +-
.../load-data/delete-manual_EN.md.txt | 181 +++++++++
.../en/administrator-guide/load-data/index.rst.txt | 1 +
.../en/getting-started/data-partition_EN.md.txt | 2 +-
.../Administration/SHOW INDEX_EN.md.txt | 8 +-
.../Data Definition/ALTER DATABASE_EN.md.txt | 1 +
.../Data Definition/CREATE TABLE_EN.md.txt | 2 +-
.../Data Manipulation/SHOW DATA_EN.md.txt | 10 +-
.../sql-statements/Data Types/BOOLEAN_EN.md.txt | 2 +-
.../alter-table/alter-table-bitmap-index.html | 2 +-
.../alter-table/alter-table-rollup.html | 2 +-
.../alter-table/alter-table-schema-change.html | 2 +-
.../alter-table/alter-table-temp-partition.html | 4 +-
.../cn/administrator-guide/alter-table/index.html | 6 +-
.../cn/administrator-guide/backup-restore.html | 2 +-
.../cn/administrator-guide/broker.html | 2 +-
.../cn/administrator-guide/colocation-join.html | 2 +-
.../cn/administrator-guide/config/fe_config.html | 2 +-
.../cn/administrator-guide/config/index.html | 2 +-
.../cn/administrator-guide/dynamic-partition.html | 2 +-
.../cn/administrator-guide/export-manual.html | 2 +-
.../http-actions/cancel-label.html | 2 +-
.../http-actions/compaction-action.html | 2 +-
.../http-actions/fe-get-log-file.html | 2 +-
.../http-actions/get-label-state.html | 2 +-
.../cn/administrator-guide/http-actions/index.html | 2 +-
.../http-actions/restore-tablet.html | 2 +-
.../cn/administrator-guide/index.html | 4 +-
.../load-data/broker-load-manual.html | 3 +-
.../load-data/delete-manual.html | 426 +++++++++++++++++++++
.../cn/administrator-guide/load-data/index.html | 10 +-
.../load-data/insert-into-manual.html | 7 +-
.../administrator-guide/load-data/load-manual.html | 3 +-
.../load-data/routine-load-manual.html | 3 +-
.../load-data/stream-load-manual.html | 3 +-
.../materialized-view/index.html | 2 +-
.../operation/disk-capacity.html | 2 +-
.../cn/administrator-guide/operation/index.html | 2 +-
.../operation/metadata-operation.html | 2 +-
.../operation/monitor-alert.html | 2 +-
.../operation/multi-tenant.html | 2 +-
.../operation/tablet-meta-tool.html | 2 +-
.../operation/tablet-repair-and-balance.html | 2 +-
.../operation/tablet-restore-tool.html | 2 +-
.../cn/administrator-guide/privilege.html | 6 +-
.../cn/administrator-guide/segment-v2-usage.html | 199 +++++-----
.../cn/administrator-guide/small-file-mgr.html | 6 +-
.../cn/administrator-guide/sql-mode.html | 2 +-
.../cn/administrator-guide/time-zone.html | 2 +-
.../cn/administrator-guide/variables.html | 2 +-
.../cn/getting-started/data-partition.html | 2 +-
content/documentation/cn/index.html | 11 +-
.../sql-statements/Administration/SHOW INDEX.html | 4 +-
.../Data Definition/ALTER DATABASE.html | 9 +-
.../Data Manipulation/ROUTINE LOAD.html | 6 +-
.../Data Manipulation/SHOW DATA.html | 14 +-
.../sql-statements/Data Types/BOOLEAN.html | 2 +-
.../en/administrator-guide/alter-table/index.html | 4 +-
.../load-data/broker-load-manual_EN.html | 1 +
.../load-data/delete-manual_EN.html | 424 ++++++++++++++++++++
.../en/administrator-guide/load-data/index.html | 8 +
.../load-data/insert-into-manual_EN.html | 5 +-
.../load-data/load-manual_EN.html | 1 +
.../load-data/routine-load-manual_EN.html | 1 +
.../load-data/stream-load-manual_EN.html | 1 +
.../en/getting-started/data-partition_EN.html | 2 +-
.../Administration/SHOW INDEX_EN.html | 10 +-
.../Data Definition/ALTER DATABASE_EN.html | 3 +-
.../Data Definition/CREATE TABLE_EN.html | 2 +-
.../Data Manipulation/SHOW DATA_EN.html | 10 +-
.../sql-statements/Data Types/BOOLEAN_EN.html | 2 +-
content/nohup.out | Bin 3633 -> 2673 bytes
content/objects.inv | Bin 10393 -> 10414 bytes
content/searchindex.js | 2 +-
83 files changed, 1595 insertions(+), 285 deletions(-)
diff --git a/content/_sources/documentation/cn/administrator-guide/alter-table/alter-table-temp-partition.md.txt b/content/_sources/documentation/cn/administrator-guide/alter-table/alter-table-temp-partition.md.txt
index eb8068a..0911ee5 100644
--- a/content/_sources/documentation/cn/administrator-guide/alter-table/alter-table-temp-partition.md.txt
+++ b/content/_sources/documentation/cn/administrator-guide/alter-table/alter-table-temp-partition.md.txt
@@ -163,7 +163,7 @@ PROPERTIES (
```
```
- curl --location-trusted -u root: -H "label:123" -H "temporary_partition: tp1, tp2, ..." -T testData http://host:port/api/testDb/testTbl/_stream_load
+ curl --location-trusted -u root: -H "label:123" -H "temporary_partitions: tp1, tp2, ..." -T testData http://host:port/api/testDb/testTbl/_stream_load
```
```
diff --git a/content/_sources/documentation/cn/administrator-guide/load-data/delete-manual.md.txt b/content/_sources/documentation/cn/administrator-guide/load-data/delete-manual.md.txt
new file mode 100644
index 0000000..cc5404e
--- /dev/null
+++ b/content/_sources/documentation/cn/administrator-guide/load-data/delete-manual.md.txt
@@ -0,0 +1,176 @@
+<!--
+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.
+-->
+
+# Delete
+
+Delete不同于其他导入方式，它是一个同步过程。和Insert into相似，所有的Delete操作在Doris中是一个独立的导入作业，一般Delete语句需要指定表和分区以及删除的条件来筛选要删除的数据，并将会同时删除base表和rollup表的数据。
+
+## 语法
+
+主要的Delete语法如下：
+
+```
+DELETE FROM table_name [PARTITION partition_name]
+WHERE
+column_name1 op value[ AND column_name2 op value ...];
+```
+
+示例1：
+
+```
+DELETE FROM my_table PARTITION p1 WHERE k1 = 3;
+```
+
+示例2:
+
+```
+DELETE FROM my_table PARTITION p1 WHERE k1 < 3 AND k2 = "abc";
+```
+
+下面介绍删除语句中使用到的参数：
+
+* PARTITION
+
+ Delete语句的目标分区，若未指定，则此表必须为单分区表，否则无法delete
+
+* WHERE
+
+ Delete语句的条件语句，所有删除语句都必须指定WHERE语句
+
+说明：
+
+1. `Where`语句中的op的类型可包括`=,>,<,>=,<=,!=`，目前暂时不支持 where key in (value1, value2, value3) 的方式选定范围，后续将加上此功能。
+2. `Where`语句中的列只能是`key`列
+3. 当选定的`key`列不存在某个rollup表内时，无法进行delete
+4. 条件语句中各个条件只能是`and`关系，如希望达成`or`可将条件分别写入两个delete语句中
+5. 如果指定表为RANGE分区表，则必须指定 `PARTITION`。如果是单分区表，可以不指定。
+6. 不同于Insert into命令，delete不能手动指定`label`，有关label的概念可以查看[Insert Into文档] (./insert-into-manual.md)
+
+## 返回结果
+
+Delete命令是一个SQL命令，返回结果是同步的，分为以下几种：
+
+1. 执行成功
+
+ 如果Delete顺利执行完成并可见，将返回下列结果，`Query OK`表示成功
+
+ ```
+ 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'}
+ ```
+
+2. 提交成功，但未可见
+
+ Doris的事务提交分为两步：提交和发布版本，只有完成了发布版本步骤，结果才对用户是可见的。若已经提交成功了，那么就可以认为最终一定会发布成功，Doris会尝试在提交完后等待发布一段时间，如果超时后即使发布版本还未完成也会优先返回给用户，提示用户提交已经完成。若如果Delete已经提交并执行，但是仍未发布版本和可见，将返回下列结果
+
+ ```
+ 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', 'err':'delete job is committed but may be taking effect later' }
+ ```
+
+ 结果会同时返回一个json字符串：
+
+ `affected rows`表示此次删除影响的行，由于Doris的删除目前是逻辑删除，因此对于这个值是恒为0。
+
+ `label`为自动生成的 label，是该导入作业的标识。每个导入作业，都有一个在单 database 内部唯一的 Label。
+
+ `status`表示数据删除是否可见，如果可见，显示`VISIBLE`，如果不可见,显示`COMMITTED`。
+
+ `txnId`为这个Delete job对应的事务id
+
+ `err`字段会显示一些本次删除的详细信息
+
+3. 提交失败，事务取消
+
+ 如果Delete语句没有提交成功，将会被Doris自动中止，返回下列结果
+
+ ```
+ mysql> delete from test_tbl partition p1 where k1 > 80;
+ ERROR 1064 (HY000): errCode = 2, detailMessage = {错误原因}
+ ```
+
+ 示例：
+
+ 比如说一个超时的删除，将会返回timeout时间和未完成的`(tablet=replica)`
+
+ ```
+ 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
+ ```
+
+ **综上，对于Delete操作返回结果的正确处理逻辑为：**
+
+ 1. 如果返回结果为`ERROR 1064 (HY000)`，则表示删除失败
+
+ 2. 如果返回结果为`Query OK`，则表示删除执行成功
+
+ 1. 如果`status`为`COMMITTED`，表示数据仍不可见，用户可以稍等一段时间再用`show delete`命令查看结果
+ 2. 如果`status`为`VISIBLE`，表示数据删除成功。
+
+## 可配置项
+
+### FE配置
+
+**TIMEOUT配置**
+
+总体来说，Doris的删除作业的超时时间限制在30秒到5分钟时间内，具体时间可通过下面配置项调整
+
+* tablet\_delete\_timeout\_second
+
+ delete自身的超时时间是可受指定分区下tablet的数量弹性改变的，此项配置为平均一个tablet所贡献的timeout时间，默认值为2。
+
+ 假设此次删除所指定分区下有5个tablet，那么可提供给delete的timeout时间为10秒，由于低于最低超时时间30秒，因此最终超时时间为30秒。
+
+* load\_straggler\_wait\_second
+
+ 如果用户预估的数据量确实比较大，使得5分钟的上限不足时，用户可以通过此项调整timeout上限，默认值为300。
+
+ **TIMEOUT的具体计算规则为(秒)**
+
+ `TIMEOUT = MIN(load_straggler_wait_second, MAX(30, tablet_delete_timeout_second * tablet_num))`
+
+* query_timeout
+
+ 因为delete本身是一个SQL命令，因此删除语句也会受session限制，timeout还受Session中的`query_timeout`值影响，可以通过`SET query_timeout = xxx`来增加超时时间，单位是秒。
+
+## 查看历史记录
+
+1. 用户可以通过show delete语句查看历史上已执行完成的删除记录
+
+ 语法
+
+ ```
+ SHOW DELETE [FROM db_name]
+ ```
+
+ 示例
+
+ ```
+ mysql> show delete from test_db;
+ +-----------+---------------+---------------------+-----------------+----------+
+ | TableName | PartitionName | CreateTime | DeleteCondition | State |
+ +-----------+---------------+---------------------+-----------------+----------+
+ | empty_tbl | p3 | 2020-04-15 23:09:35 | k1 EQ "1" | FINISHED |
+ | test_tbl | p4 | 2020-04-15 23:09:53 | k1 GT "80" | FINISHED |
+ +-----------+---------------+---------------------+-----------------+----------+
+ 2 rows in set (0.00 sec)
+ ```
+
diff --git a/content/_sources/documentation/cn/administrator-guide/load-data/index.rst.txt b/content/_sources/documentation/cn/administrator-guide/load-data/index.rst.txt
index f4807d1..b5aad9f 100644
--- a/content/_sources/documentation/cn/administrator-guide/load-data/index.rst.txt
+++ b/content/_sources/documentation/cn/administrator-guide/load-data/index.rst.txt
@@ -10,3 +10,4 @@
stream-load-manual.md
routine-load-manual.md
insert-into-manual.md
+ delete-manual.md
diff --git a/content/_sources/documentation/cn/administrator-guide/segment-v2-usage.md.txt b/content/_sources/documentation/cn/administrator-guide/segment-v2-usage.md.txt
index faf6b59..09b6f0c 100644
--- a/content/_sources/documentation/cn/administrator-guide/segment-v2-usage.md.txt
+++ b/content/_sources/documentation/cn/administrator-guide/segment-v2-usage.md.txt
@@ -1,118 +1,147 @@
-# Doris Segment V2上线和试用手册
+<!--
+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.
+-->
+
+# Segment V2 升级手册
## 背景
-Doris 0.12版本中实现了segment v2（新的存储格式），引入词典压缩、bitmap索引、page cache等优化，能够提升系统性能。目前0.12版本已经发布alpha版本，正在内部上线过程中，上线的方案和试用方法记录如下
+Doris 0.12 版本中实现了新的存储格式：Segment V2，引入词典压缩、bitmap索引、page cache等优化，能够提升系统性能。
-## 上线
+0.12 版本会同时支持读写原有的 Segment V1（以下简称V1） 和新的 Segment V2（以下简称V2） 两种格式。如果原有数据想使用 V2 相关特性，需通过命令将 V1 转换成 V2 格式。
-为了保证上线的稳定性，上线分为三个阶段：
-第一个阶段是上线0.12版本，但是不全量开启segment v2的功能，只在验证的时候，创建segment v2的表（或者索引）
-第二个阶段是全量开启segment v2的功能，替换现有的segment存储格式，这样对新表会创建segment v2的格式的存储文件，但是对于旧表，需要依赖于compaction和schema change等过程，实现格式的转化
-第三个阶段就是转化旧的segment格式到新的segment v2的格式，这个需要在验证segment v2的正确性和性能没有问题之后，可以按照用户意愿逐步完成。
+本文档主要介绍从 0.11 版本升级至 0.12 版本后，如何转换和使用 V2 格式。
-### 上线验证
+V2 格式的表可以支持以下新的特性：
-- 正确性
+1. bitmap 索引
+2. 内存表
+3. page cache
+4. 字典压缩
+5. 延迟物化（Lazy Materialization）
-正确性是segment v2上线最需要保证的指标。 在第一阶段，为了保证线上环境的稳定性，并且验证segment v2的正确性，采用如下的方案：
-1. 选择几个需要验证的表，使用以下语句，创建segment v2格式的rollup表，该rollup表与base表的schema相同
+## 集群升级
- alter table table_name add rollup table_name (columns) properties ("storage_format" = "v2");
+0.12 版本仅支持从 0.11 版本升级，不支持从 0.11 之前的版本升级。请先确保升级的前的 Doris 集群版本为 0.11。
- 其中，
- rollup后面的index名字直接指定为base table的table name，该语句会自动生成一个__v2_table_name。
+0.12 版本有两个 V2 相关的重要参数：
- columns可以随便指定一个列名即可，这里一方面是为了兼容现有的语法，一方面是为了方便。
+* `default_rowset_type`：FE 一个全局变量（Global Variable）设置，默认为 "alpha"，即 V1 版本。
+* `default_rowset_type`：BE 的一个配置项，默认为 "ALPHA"，即 V1 版本。
-2. 上面的创建出来的rollup index名字格式类似：__v2_table_name
+保持上述配置默认的话，按常规步骤对集群升级后，原有集群数据的存储格式不会变更，即依然为 V1 格式。如果对 V2 格式没有需求，则继续正常使用集群即可，无需做任何额外操作。所有原有数据、以及新导入的数据，都依然是 V1 版本。
- 通过命令 :
+## V2 格式转换
- `desc table_name all;`
+### 已有表数据转换成 V2
- 查看table中是否存在名字：__v2_table_name的rollup。由于创建segment v2的rollup表是一个异步操作，所以并不会立即成功。如果上面命令中并没有显示新创建的 rollup，可能是还在创建过程中。
+对于已有表数据的格式转换，Doris 提供两种方式：
- 可以通过下面命令查看正在进行的 rollup 表。
+1. 创建一个 V2 格式的特殊 Rollup
- `show alter table rollup;`
+ 该方式会针对指定表，创建一个 V2 格式的特殊 Rollup。创建完成后，新的 V2 格式的 Rollup 会和原有表格式数据并存。用户可以指定对 V2 格式的 Rollup 进行查询验证。
+
+ 该方式主要用于对 V2 格式的验证，因为不会修改原有表数据，因此可以安全的进行 V2 格式的数据验证，而不用担心表数据因格式转换而损坏。通常先使用这个方式对数据进行校验，之后再使用方法2对整个表进行数据格式转换。
+
+ 操作步骤如下：
+
+ ```
+ ## 创建 V2 格式的 Rollup
- 看到会有一个名字为__v2_table_name的rollup表正在创建。
+ ALTER TABLE table_name ADD ROLLUP table_name (columns) PROPERTIES ("storage_format" = "v2");
+ ```
-3. 通过查询base表和segment v2格式的rollup表，验证查询结果是否一致（查询可以来自audit日志）
+ 其中， Rollup 的名称必须为表名。columns 字段可以任意填写，系统不会检查该字段的合法性。该语句会自动生成一个名为 `__V2_table_name` 的 Rollup，并且该 Rollup 列包含表的全部列。
+
+ 通过以下语句查看创建进度：
+
+ ```
+ SHOW ALTER TABLE ROLLUP;
+ ```
+
+ 创建完成后，可以通过 `DESC table_name ALL;` 查看到名为 `__v2_table_name` 的 Rollup。
+
+ 之后，通过如下命令，切换到 V2 格式查询：
- 为了让查询使用segment v2的rollup表，增加了一个session变量，通过在查询中使用如下的语句，来查询segment v2格式的index：
+ ```
+ set use_v2_rollup = true;
+ select * from table_name limit 10;
+ ```
+
+ `use_V2_Rollup` 这个变量会强制查询名为 `__V2_table_name` 的 Rollup，并且不会考虑其他 Rollup 的命中条件。所以该参数仅用于对 V2 格式数据进行验证。
- set use_v2_rollup = true;
+2. 转换现有表数据格式
- 比如说，要当前db中有一个simple的表，直接查询如下：
+ 该方式相当于给指定的表发送一个 schema change 作业，作业完成后，表的所有数据会被转换成 V2 格式。该方法不会保留原有 v1 格式，所以请先使用方法1进行格式验证。
+
+ ```
+ ALTER TABLE table_name SET ("storage_format" = "v2");
+ ```
- ```
- mysql> select * from simple;
- +------+-------+
- | key | value |
- +------+-------+
- | 2 | 6 |
- | 1 | 6 |
- | 4 | 5 |
- +------+-------+
- 3 rows in set (0.01 sec)
- ```
+ 之后通过如下命令查看作业进度：
+
+ ```
+ SHOW ALTER TABLE COLUMN;
+ ```
+
+ 作业完成后，该表的所有数据（包括Rollup）都转换为了 V2。且 V1 版本的数据已被删除。如果该表是分区表，则之后创建的分区也都是 V2 格式。
+
+ **V2 格式的表不能重新转换为 V1**
+
+### 创建新的 V2 格式的表
- 然后使用使用如下的query查询__v2_simpel的rollup表：
+在不改变默认配置参数的情况下，用户可以创建 V2 格式的表：
- ```
- mysql> set use_v2_rollup = true;
- Query OK, 0 rows affected (0.04 sec)
+```
+CREATE TABLE tbl_name
+(
+ k1 INT,
+ k2 INT
+)
+DISTRIBUTED BY HASH(k1) BUCKETS 1
+PROPERTIES
+(
+ "storage_format" = "v2"
+);
+```
- mysql> select * from simple;
- +------+-------+
- | key | value |
- +------+-------+
- | 4 | 5 |
- | 1 | 6 |
- | 2 | 6 |
- +------+-------+
- 3 rows in set (0.01 sec)
- ```
+在 `properties` 中指定 `"storage_format" = "v2"` 后，该表将使用 V2 格式创建。如果是分区表，则之后创建的分区也都是 V2 格式。
- 期望的结果是两次查询的结果相同。
- 如果结果不一致，需要进行排查。第一步需要定位是否是因为由于两次查询之间有新的导入，导致数据不一致。如果是的话，需要进行重试。如果不是，则需要进一步定位原因。
+### 全量格式转换(试验功能)
-4. 对比同样查询在base表和segment v2的rollup表中的结果是否一致
+通过以下方式可以开启整个集群的全量数据格式转换（V1 -> V2）。全量数据转换是通过 BE 后台的数据 compaction 过程异步进行的。
-- 查询延时
-
- 在segment v2中优化了v1中的随机读取，并且增加了bitmap索引、lazy materialization等优化，预计查询延时会有下降，
-
-- 导入延时
-- page cache命中率
-- string类型字段压缩率
-- bitmap索引的性能提升率和空间占用
-
-### 全量开启segment v2
-
-有两个方式：
-1. fe中有一个全局变量，通过设置全局变量default_rowset_type，来设置BE中使用segment v2作为默认的存储格式，命令如下：
-
- set global default_rowset_type = beta;
-
- 使用这个方式，只需要执行上述命令，之后等待10s左右，FE会将配置同步到BE中。不需要在每个BE中进行配置。推荐使用这个配置。不过该方式目前没有简单的方式来验证BE上的default rowset type是否已经变更，一种办法是建一个表，然后查看对应的表的元数据。但是这样子比较麻烦，后续看需要可以在某个地方实现状态查看。
-
-2. 修改BE中的配置文件中的配置default_rowset_type为BETA。这种方式需要在每个BE中添加对应的配置。
-
-
-### 转化segment v1格式为v2
-
-如果不想等待系统后台自动转换存储格式（比如想要使用bitmap索引、词典压缩），可以手动指定触发某个表的存储格式转换。具体是通过schema change来实现将v1的格式转化为v2的格式：
-
- alter table table_name set ("storage_format" = "v2");
-
- 将存储格式转化为v2.
-
-如果在没有设置默认的存储格式为v2的时候，想要新建一个v2的表，需要按照以下的步骤进行操作：
-1. 使用create table来创建v1的表
-2. 使用上面的schema change命令进行格式的转化
+1. 从 BE 开启全量格式转换
+ 在 `be.conf` 中添加变量 `default_rowset_type=BETA` 并重启 BE 节点。在之后的 compaction 流程中，数据会自动从 V1 转换成 V2。
+
+2. 从 FE 开启全量格式转换
+ 通过 mysql 客户端连接 Doris 后，执行如下语句：
+
+ `SET GLOBAL default_rowset_type = beta;`
+ 执行完成后，FE 会通过心跳将信息发送给 BE，之后 BE 的 compaction 流程中，数据会自动从 V1 转换成 V2。
+
+ FE 的配置参数优先级高于 BE 的配置。即使 BE 中的配置 `default_rowset_type` 为 ALPHA，如果 FE 配置为 beta 后，则 BE 依然开始进行 V1 到 V2 的数据格式转换。
+
+ **建议先通过对单独表的数据格式转换验证后，再进行全量转换。全量转换的时间比较长，且进度依赖于 compaction 的进度。**可能出现 compaction 无法完成的情况，因此需要通过显式的执行 `ALTER TABLE` 操作进行个别表的数据格式转换。
+
+3. 查看全量转换进度
+
+ 全量转换进度须通过脚本查看。脚本位置为代码库的 `tools/show_segment_status/` 目录。请参阅其中的 `README` 文档查看使用帮助。
diff --git a/content/_sources/documentation/cn/getting-started/data-partition.md.txt b/content/_sources/documentation/cn/getting-started/data-partition.md.txt
index 02199e4..5593d5e 100644
--- a/content/_sources/documentation/cn/getting-started/data-partition.md.txt
+++ b/content/_sources/documentation/cn/getting-started/data-partition.md.txt
@@ -247,7 +247,7 @@ PARTITION BY RANGE(`date`, `id`)
* BE 的数据存储目录可以显式的指定为 SSD 或者 HDD（通过 .SSD 或者 .HDD 后缀区分）。建表时，可以统一指定所有 Partition 初始存储的介质。注意，后缀作用是显式指定磁盘介质，而不会检查是否与实际介质类型相符。
* 默认初始存储介质可通过fe的配置文件 `fe.conf` 中指定 `default_storage_medium=xxx`，如果没有指定，则默认为 HDD。如果指定为 SSD，则数据初始存放在 SSD 上。
- * 如果没有指定 storage\_cooldown\_time，则默认 7 天后，数据会从 SSD 自动迁移到 HDD 上。如果指定了 storage\_cooldown\_time，则在到达 storage_cooldown_time 时间后，数据才会迁移。
+ * 如果没有指定 storage\_cooldown\_time，则默认 30 天后，数据会从 SSD 自动迁移到 HDD 上。如果指定了 storage\_cooldown\_time，则在到达 storage_cooldown_time 时间后，数据才会迁移。
* 注意，当指定 storage_medium 时，该参数只是一个“尽力而为”的设置。即使集群内没有设置 SSD 存储介质，也不会报错，而是自动存储在可用的数据目录中。同样，如果 SSD 介质不可访问、空间不足，都可能导致数据初始直接存储在其他可用介质上。而数据到期迁移到 HDD 时，如果 HDD 介质不可访问、空间不足，也可能迁移失败（但是会不断尝试）。
### ENGINE
diff --git a/content/_sources/documentation/cn/sql-reference/sql-statements/Administration/SHOW INDEX.md.txt b/content/_sources/documentation/cn/sql-reference/sql-statements/Administration/SHOW INDEX.md.txt
index 8bad66b..d29a5df 100644
--- a/content/_sources/documentation/cn/sql-reference/sql-statements/Administration/SHOW INDEX.md.txt
+++ b/content/_sources/documentation/cn/sql-reference/sql-statements/Administration/SHOW INDEX.md.txt
@@ -23,7 +23,9 @@ under the License.
该语句用于展示一个表中索引的相关信息，目前只支持bitmap 索引
语法：
- SHOW INDEX[ES] FROM [db_name.]table_name;
+ SHOW INDEX[ES] FROM [db_name.]table_name [FROM database];
+ 或者
+ SHOW KEY[S] FROM [db_name.]table_name [FROM database];
## example
diff --git a/content/_sources/documentation/cn/sql-reference/sql-statements/Data Definition/ALTER DATABASE.md.txt b/content/_sources/documentation/cn/sql-reference/sql-statements/Data Definition/ALTER DATABASE.md.txt
index 66b692c..f6f1c4c 100644
--- a/content/_sources/documentation/cn/sql-reference/sql-statements/Data Definition/ALTER DATABASE.md.txt
+++ b/content/_sources/documentation/cn/sql-reference/sql-statements/Data Definition/ALTER DATABASE.md.txt
@@ -27,8 +27,12 @@ under the License.
2) 重命名数据库
ALTER DATABASE db_name RENAME new_db_name;
+ 3) 设置数据库的副本数量配额
+ ALTER DATABASE db_name SET REPLICA QUOTA quota;
+
说明：
- 重命名数据库后，如需要，请使用 REVOKE 和 GRANT 命令修改相应的用户权限。
+ 重命名数据库后，如需要，请使用 REVOKE 和 GRANT 命令修改相应的用户权限。
+ 数据库的默认数据量配额为1024GB，默认副本数量配额为1073741824。
## example
1. 设置指定数据库数据量配额
@@ -42,6 +46,9 @@ under the License.
2. 将数据库 example_db 重命名为 example_db2
ALTER DATABASE example_db RENAME example_db2;
+
+ 3. 设定指定数据库副本数量配额
+ ALTER DATABASE example_db SET REPLICA QUOTA 102400;
## keyword
ALTER,DATABASE,RENAME
diff --git a/content/_sources/documentation/cn/sql-reference/sql-statements/Data Manipulation/ROUTINE LOAD.md.txt b/content/_sources/documentation/cn/sql-reference/sql-statements/Data Manipulation/ROUTINE LOAD.md.txt
index 33c4d59..c7a4f79 100644
--- a/content/_sources/documentation/cn/sql-reference/sql-statements/Data Manipulation/ROUTINE LOAD.md.txt
+++ b/content/_sources/documentation/cn/sql-reference/sql-statements/Data Manipulation/ROUTINE LOAD.md.txt
@@ -234,9 +234,10 @@ under the License.
NULL值：\N
## example
- 1. 为 example_db 的 example_tbl 创建一个名为 test1 的 Kafka 例行导入任务。指定group.id和client.id，并且自动默认消费所有分区，且从末尾（OFFSET_END）开始订阅
+ 1. 为 example_db 的 example_tbl 创建一个名为 test1 的 Kafka 例行导入任务。指定列分隔符和 group.id 和 client.id，并且自动默认消费所有分区，且从有数据的位置（OFFSET_BEGINNING）开始订阅
CREATE ROUTINE LOAD example_db.test1 ON example_tbl
+ COLUMNS TERMINATED BY ",",
COLUMNS(k1, k2, k3, v1, v2, v3 = k1 * 100)
PROPERTIES
(
@@ -251,7 +252,8 @@ under the License.
"kafka_broker_list" = "broker1:9092,broker2:9092,broker3:9092",
"kafka_topic" = "my_topic",
"property.group.id" = "xxx",
- "property.client.id" = "xxx"
+ "property.client.id" = "xxx",
+ "property.kafka_default_offsets" = "OFFSET_BEGINNING"
);
2. 为 example_db 的 example_tbl 创建一个名为 test1 的 Kafka 例行导入任务。导入任务为严格模式。
diff --git a/content/_sources/documentation/cn/sql-reference/sql-statements/Data Manipulation/SHOW DATA.md.txt b/content/_sources/documentation/cn/sql-reference/sql-statements/Data Manipulation/SHOW DATA.md.txt
index 48c0d70..74f7e2e 100644
--- a/content/_sources/documentation/cn/sql-reference/sql-statements/Data Manipulation/SHOW DATA.md.txt
+++ b/content/_sources/documentation/cn/sql-reference/sql-statements/Data Manipulation/SHOW DATA.md.txt
@@ -19,20 +19,20 @@ under the License.
# SHOW DATA
## description
- 该语句用于展示数据量
+ 该语句用于展示数据量和副本数量
语法：
SHOW DATA [FROM db_name[.table_name]];
说明：
- 1. 如果不指定 FROM 子句，使用展示当前 db 下细分到各个 table 的数据量
- 2. 如果指定 FROM 子句，则展示 table 下细分到各个 index 的数据量
+ 1. 如果不指定 FROM 子句，使用展示当前 db 下细分到各个 table 的数据量和副本数量
+ 2. 如果指定 FROM 子句，则展示 table 下细分到各个 index 的数据量和副本数量
3. 如果想查看各个 Partition 的大小，请参阅 help show partitions
## example
- 1. 展示默认 db 的各个 table 的数据量及汇总数据量
+ 1. 展示默认 db 的各个 table 的数据量，副本数量，汇总数据量和汇总副本数量。
SHOW DATA;
- 2. 展示指定 db 的下指定表的细分数据量
+ 2. 展示指定 db 的下指定表的细分数据量和副本数量
SHOW DATA FROM example_db.table_name;
## keyword
diff --git a/content/_sources/documentation/cn/sql-reference/sql-statements/Data Types/BOOLEAN.md.txt b/content/_sources/documentation/cn/sql-reference/sql-statements/Data Types/BOOLEAN.md.txt
index 7da0b7a..b5f46fa 100644
--- a/content/_sources/documentation/cn/sql-reference/sql-statements/Data Types/BOOLEAN.md.txt
+++ b/content/_sources/documentation/cn/sql-reference/sql-statements/Data Types/BOOLEAN.md.txt
@@ -19,7 +19,7 @@ under the License.
# BOOLEAN
## description
- BOOL, BOOLEN
+ BOOL, BOOLEAN
与TINYINT一样，0代表false，1代表true
## keyword
diff --git a/content/_sources/documentation/en/administrator-guide/load-data/delete-manual_EN.md.txt b/content/_sources/documentation/en/administrator-guide/load-data/delete-manual_EN.md.txt
new file mode 100644
index 0000000..04c980e
--- /dev/null
+++ b/content/_sources/documentation/en/administrator-guide/load-data/delete-manual_EN.md.txt
@@ -0,0 +1,181 @@
+<!--
+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.
+-->
+
+# Delete
+
+Unlike other import methods, delete is a synchronization process. Similar to insert into, all delete operations are an independent import job in Doris. Generally, delete statements need to specify tables, partitions and delete conditions to tell which data to be deleted, and the data on base index and rollup index will be deleted at the same time.
+
+
+## Syntax
+
+The delete statement's syntax is as follows：
+
+```
+DELETE FROM table_name [PARTITION partition_name]
+WHERE
+column_name1 op value[ AND column_name2 op value ...];
+```
+
+example 1：
+
+```
+DELETE FROM my_table PARTITION p1 WHERE k1 = 3;
+```
+
+example 2:
+
+```
+DELETE FROM my_table PARTITION p1 WHERE k1 < 3 AND k2 = "abc";
+```
+
+The following describes the parameters used in the delete statement:
+
+* PARTITION
+
+ The target partition of the delete statement. If not specified, the table must be a single partition table, otherwise it cannot be deleted
+
+* WHERE
+
+ The conditiona of the delete statement. All delete statements must specify a where condition.
+
+说明：
+
+1. The type of `OP` in the WHERE condition can only include `=, >, <, > =, < =,!=`. Currently, where key in (value1, Value2, value3) mode is not supported yet, may be added this support later.
+2. The column in the WHERE condition can only be the `key` column.
+3. Cannot delete when the `key` column does not exist in any rollup table.
+4. Each condition in WHERE condition can only be realated by `and`. If you want `or`, you are suggested to write these conditions into two delete statements.
+5. If the specified table is a range partitioned table, `PARTITION` must be specified unless the table is a single partition table,.
+6. Unlike the insert into command, delete statement cannot specify `label` manually. You can view the concept of `label` in [Insert Into] (./insert-into-manual.md)
+
+## Delete Result
+
+The delete command is an SQL command, and the returned results are synchronous. It can be divided into the following types:
+
+1. Successful visible
+
+ If delete completes successfully and is visible, the following results will be returned, `query OK` indicates success.
+
+ ```
+ 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'}
+ ```
+
+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 [...]
+
+ ```
+ 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', 'err':'delete job is committed but may be taking effect later' }
+ ```
+
+ 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.
+
+ `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.
+
+
+ `txnId`: The transaction ID corresponding to the delete job
+
+ `err`: Field will display some details of this deletion
+
+3. Commit failed, transaction cancelled
+
+ If the delete statement is not submitted successfully, it will be automatically aborted by Doris and the following results will be returned
+
+
+ ```
+ mysql> delete from test_tbl partition p1 where k1 > 80;
+ ERROR 1064 (HY000): errCode = 2, detailMessage = {错误原因}
+ ```
+
+ example：
+
+ A timeout deletion will return the timeout and unfinished replicas displayed as ` (tablet = replica)`
+
+
+ ```
+ 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
+ ```
+
+ **The correct processing logic for the returned results of the delete operation is as follows:**
+
+ 1. If `Error 1064 (HY000)` is returned, deletion fails
+
+ 2. If the returned result is `Query OK`, the deletion is successful
+
+ 1. If `status` is `committed`, the data deletion is committed and will be eventually invisible. Users can wait for a while and then use the `show delete` command to view the results.
+ 2. If `status` is `visible`, the data have been deleted successfully.
+
+## Relevant Configuration
+
+### FE configuration
+
+**TIMEOUT configuration**
+
+In general, Doris's deletion timeout is limited from 30 seconds to 5 minutes. The specific time can be adjusted through the following configuration items
+
+* tablet\_delete\_timeout\_second
+
+ The timeout of delete itself can be elastically changed by the number of tablets in the specified partition. This configuration represents the average timeout contributed by a tablet. The default value is 2.
+
+ Assuming that there are 5 tablets under the specified partition for this deletion, the timeout time available for the deletion is 10 seconds. Because the minimum timeout is 30 seconds which is higher than former timeout time, the final timeout is 30 seconds.
+
+* load\_straggler\_wait\_second
+
+ If the user estimates a large amount of data, so that the upper limit of 5 minutes is insufficient, the user can adjust the upper limit of timeout through this item, and the default value is 300.
+
+ **The specific calculation rule of timeout(seconds)**
+
+ `TIMEOUT = MIN(load_straggler_wait_second, MAX(30, tablet_delete_timeout_second * tablet_num))`
+
+* query_timeout
+
+ Because delete itself is an SQL command, the deletion statement is also limited by the session variables, and the timeout is also affected by the session value `query'timeout`. You can increase the value by `set query'timeout = xxx`.
+
+## Show delete history
+
+1. The user can view the deletion completed in history through the show delete statement.
+
+ Syntax
+
+ ```
+ SHOW DELETE [FROM db_name]
+ ```
+
+ example
+
+ ```
+ mysql> show delete from test_db;
+ +-----------+---------------+---------------------+-----------------+----------+
+ | TableName | PartitionName | CreateTime | DeleteCondition | State |
+ +-----------+---------------+---------------------+-----------------+----------+
+ | empty_tbl | p3 | 2020-04-15 23:09:35 | k1 EQ "1" | FINISHED |
+ | test_tbl | p4 | 2020-04-15 23:09:53 | k1 GT "80" | FINISHED |
+ +-----------+---------------+---------------------+-----------------+----------+
+ 2 rows in set (0.00 sec)
+ ```
+
diff --git a/content/_sources/documentation/en/administrator-guide/load-data/index.rst.txt b/content/_sources/documentation/en/administrator-guide/load-data/index.rst.txt
index 159b0d2..eb02840 100644
--- a/content/_sources/documentation/en/administrator-guide/load-data/index.rst.txt
+++ b/content/_sources/documentation/en/administrator-guide/load-data/index.rst.txt
@@ -10,3 +10,4 @@ Load Data
stream-load-manual_EN.md
routine-load-manual_EN.md
insert-into-manual_EN.md
+ delete-manual_EN.md
diff --git a/content/_sources/documentation/en/getting-started/data-partition_EN.md.txt b/content/_sources/documentation/en/getting-started/data-partition_EN.md.txt
index 1383ddb..a06bb51 100644
--- a/content/_sources/documentation/en/getting-started/data-partition_EN.md.txt
+++ b/content/_sources/documentation/en/getting-started/data-partition_EN.md.txt
@@ -243,7 +243,7 @@ Replication_num
* The BE data storage directory can be explicitly specified as SSD or HDD (differentiated by .SSD or .HDD suffix). When you build a table, you can uniformly specify the media for all Partition initial storage. Note that the suffix is to explicitly specify the disk media without checking to see if it matches the actual media type.
* The default initial storage media can be specified by `default_storage_medium= XXX` in the fe configuration file `fe.conf`, or, if not, by default, HDD. If specified as an SSD, the data is initially stored on the SSD.
- * If storage\_cooldown\_time is not specified, the data is automatically migrated from the SSD to the HDD after 7 days by default. If storage\_cooldown\_time is specified, the data will not migrate until the storage_cooldown_time time is reached.
+ * If storage\_cooldown\_time is not specified, the data is automatically migrated from the SSD to the HDD after 30 days by default. If storage\_cooldown\_time is specified, the data will not migrate until the storage_cooldown_time time is reached.
* Note that this parameter is just a "best effort" setting when storage_medium is specified. Even if no SSD storage media is set in the cluster, no error is reported and it is automatically stored in the available data directory. Similarly, if the SSD media is inaccessible and out of space, the data may initially be stored directly on other available media. When the data expires and is migrated to the HDD, if the HDD media is inaccessible and there is not enough space, the migration [...]
### ENGINE
diff --git a/content/_sources/documentation/en/sql-reference/sql-statements/Administration/SHOW INDEX_EN.md.txt b/content/_sources/documentation/en/sql-reference/sql-statements/Administration/SHOW INDEX_EN.md.txt
index bae48c7..996d518 100644
--- a/content/_sources/documentation/en/sql-reference/sql-statements/Administration/SHOW INDEX_EN.md.txt
+++ b/content/_sources/documentation/en/sql-reference/sql-statements/Administration/SHOW INDEX_EN.md.txt
@@ -22,8 +22,12 @@ under the License.
## description
This statement is used to show all index(only bitmap index in current version) of a table
- 语法：
- SHOW INDEX[ES] FROM [db_name.]table_name;
+ Grammar:
+ SHOW INDEX[ES] FROM [db_name.]table_name [FROM database];
+
+ OR
+
+ SHOW KEY[S] FROM [db_name.]table_name [FROM database];
## example
diff --git a/content/_sources/documentation/en/sql-reference/sql-statements/Data Definition/ALTER DATABASE_EN.md.txt b/content/_sources/documentation/en/sql-reference/sql-statements/Data Definition/ALTER DATABASE_EN.md.txt
index 01aae63..daadef1 100644
--- a/content/_sources/documentation/en/sql-reference/sql-statements/Data Definition/ALTER DATABASE_EN.md.txt
+++ b/content/_sources/documentation/en/sql-reference/sql-statements/Data Definition/ALTER DATABASE_EN.md.txt
@@ -29,6 +29,7 @@ ALTER DATABASE db_name RENAME new_db_name;
Explain:
After renaming the database, use REVOKE and GRANT commands to modify the corresponding user rights if necessary.
+The database's default data quota is 1024GB, and the default replica quota is 1073741824.
## example
1. Setting the specified database data quota
diff --git a/content/_sources/documentation/en/sql-reference/sql-statements/Data Definition/CREATE TABLE_EN.md.txt b/content/_sources/documentation/en/sql-reference/sql-statements/Data Definition/CREATE TABLE_EN.md.txt
index 129e6c1..70755ca 100644
--- a/content/_sources/documentation/en/sql-reference/sql-statements/Data Definition/CREATE TABLE_EN.md.txt
+++ b/content/_sources/documentation/en/sql-reference/sql-statements/Data Definition/CREATE TABLE_EN.md.txt
@@ -206,7 +206,7 @@ Syntax:
storage_medium: SSD or HDD, The default initial storage media can be specified by `default_storage_medium= XXX` in the fe configuration file `fe.conf`, or, if not, by default, HDD.
storage_cooldown_time: If storage_medium is SSD, data will be automatically moved to HDD when timeout.
- Default is 7 days.
+ Default is 30 days.
Format: "yyyy-MM-dd HH:mm:ss"
replication_num: Replication number of a partition. Default is 3.
If table is not range partitions. This property takes on Table level. Or it will takes on Partition level.
diff --git a/content/_sources/documentation/en/sql-reference/sql-statements/Data Manipulation/SHOW DATA_EN.md.txt b/content/_sources/documentation/en/sql-reference/sql-statements/Data Manipulation/SHOW DATA_EN.md.txt
index 1f03374..d9af60c 100644
--- a/content/_sources/documentation/en/sql-reference/sql-statements/Data Manipulation/SHOW DATA_EN.md.txt
+++ b/content/_sources/documentation/en/sql-reference/sql-statements/Data Manipulation/SHOW DATA_EN.md.txt
@@ -19,20 +19,20 @@ under the License.
# SHOW DATA
## Description
-This statement is used to show the amount of data
+This statement is used to show the amount of data and the number of replica
Grammar:
SHOW DATA [FROM db_name[.table_name]];
Explain:
-1. If you do not specify the FROM clause, use the amount of data that shows the current DB subdivided into tables
-2. If the FROM clause is specified, the amount of data subdivided into indices under the table is shown.
+1. If you do not specify the FROM clause, use the amount of data and the number of replica that shows the current DB subdivided into tables
+2. If the FROM clause is specified, the amount of data and the number of replica subdivided into indices under the table is shown.
3. If you want to see the size of individual Partitions, see help show partitions
## example
-1. Display the data volume and aggregate data volume of each table of default DB
+1. Display the data volume, replica size, aggregate data volume and aggregate replica count of each table of default DB
SHOW DATA;
-2. Display the subdivision data volume of the specified table below the specified DB
+2. Display the subdivision data volume and replica count of the specified table below the specified DB
SHOW DATA FROM example_db.table_name;
## keyword
diff --git a/content/_sources/documentation/en/sql-reference/sql-statements/Data Types/BOOLEAN_EN.md.txt b/content/_sources/documentation/en/sql-reference/sql-statements/Data Types/BOOLEAN_EN.md.txt
index 9e6754c..1038fcc 100644
--- a/content/_sources/documentation/en/sql-reference/sql-statements/Data Types/BOOLEAN_EN.md.txt
+++ b/content/_sources/documentation/en/sql-reference/sql-statements/Data Types/BOOLEAN_EN.md.txt
@@ -19,7 +19,7 @@ under the License.
# BOOLEAN
## Description
-BOOL, BOOLEN
+BOOL, BOOLEAN
Like TINYINT, 0 stands for false and 1 for true.
##keyword
diff --git a/content/documentation/cn/administrator-guide/alter-table/alter-table-bitmap-index.html b/content/documentation/cn/administrator-guide/alter-table/alter-table-bitmap-index.html
index ad6517d..6c05521 100644
--- a/content/documentation/cn/administrator-guide/alter-table/alter-table-bitmap-index.html
+++ b/content/documentation/cn/administrator-guide/alter-table/alter-table-bitmap-index.html
@@ -108,7 +108,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/alter-table/alter-table-rollup.html b/content/documentation/cn/administrator-guide/alter-table/alter-table-rollup.html
index ad3c842..3c54c56 100644
--- a/content/documentation/cn/administrator-guide/alter-table/alter-table-rollup.html
+++ b/content/documentation/cn/administrator-guide/alter-table/alter-table-rollup.html
@@ -108,7 +108,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/alter-table/alter-table-schema-change.html b/content/documentation/cn/administrator-guide/alter-table/alter-table-schema-change.html
index 27adb07..9c7d944 100644
--- a/content/documentation/cn/administrator-guide/alter-table/alter-table-schema-change.html
+++ b/content/documentation/cn/administrator-guide/alter-table/alter-table-schema-change.html
@@ -108,7 +108,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/alter-table/alter-table-temp-partition.html b/content/documentation/cn/administrator-guide/alter-table/alter-table-temp-partition.html
index e603c20..4fa5c7f 100644
--- a/content/documentation/cn/administrator-guide/alter-table/alter-table-temp-partition.html
+++ b/content/documentation/cn/administrator-guide/alter-table/alter-table-temp-partition.html
@@ -108,7 +108,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
@@ -336,7 +336,7 @@ under the License.
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">INSERT</span> <span class="n">INTO</span> <span class="n">tbl</span> <span class="n">TEMPORARY</span> <span class="n">PARTITION</span><span class="p">(</span><span class="n">tp1</span><span class="p">,</span> <span class="n">tp2</span><span class="p">,</span> <span class="o">...</span><span class="p">)</span> <span class="n">SELECT</span> <span class="o">....</span>
</pre></div>
</div>
-<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">curl</span> <span class="o">--</span><span class="n">location</span><span class="o">-</span><span class="n">trusted</span> <span class="o">-</span><span class="n">u</span> <span class="n">root</span><span class="p">:</span> <span class="o">-</span><span class="n">H</span> <span class="s2">"label:123"</span> <span class="o">-</span><span class="n">H</span> <span class="s2">"t [...]
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">curl</span> <span class="o">--</span><span class="n">location</span><span class="o">-</span><span class="n">trusted</span> <span class="o">-</span><span class="n">u</span> <span class="n">root</span><span class="p">:</span> <span class="o">-</span><span class="n">H</span> <span class="s2">"label:123"</span> <span class="o">-</span><span class="n">H</span> <span class="s2">"t [...]
</pre></div>
</div>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>LOAD LABEL example_db.label1
diff --git a/content/documentation/cn/administrator-guide/alter-table/index.html b/content/documentation/cn/administrator-guide/alter-table/index.html
index ec29a97..9e3dd0f 100644
--- a/content/documentation/cn/administrator-guide/alter-table/index.html
+++ b/content/documentation/cn/administrator-guide/alter-table/index.html
@@ -36,7 +36,7 @@
<link rel="index" title="Index" href="../../../../genindex.html" />
<link rel="search" title="Search" href="../../../../search.html" />
<link rel="next" title="Bitmap 索引" href="alter-table-bitmap-index.html" />
- <link rel="prev" title="Insert Into" href="../load-data/insert-into-manual.html" />
+ <link rel="prev" title="Delete" href="../load-data/delete-manual.html" />
</head>
<body class="wy-body-for-nav">
@@ -108,7 +108,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
@@ -270,7 +270,7 @@ under the License.
<a href="alter-table-bitmap-index.html" class="btn btn-neutral float-right" title="Bitmap 索引" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
- <a href="../load-data/insert-into-manual.html" class="btn btn-neutral float-left" title="Insert Into" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+ <a href="../load-data/delete-manual.html" class="btn btn-neutral float-left" title="Delete" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>
diff --git a/content/documentation/cn/administrator-guide/backup-restore.html b/content/documentation/cn/administrator-guide/backup-restore.html
index d1a4bd3..15ec2f3 100644
--- a/content/documentation/cn/administrator-guide/backup-restore.html
+++ b/content/documentation/cn/administrator-guide/backup-restore.html
@@ -108,7 +108,7 @@
<li class="toctree-l3"><a class="reference internal" href="dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/broker.html b/content/documentation/cn/administrator-guide/broker.html
index 38f9939..2de8e5f 100644
--- a/content/documentation/cn/administrator-guide/broker.html
+++ b/content/documentation/cn/administrator-guide/broker.html
@@ -107,7 +107,7 @@
<li class="toctree-l3"><a class="reference internal" href="dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/colocation-join.html b/content/documentation/cn/administrator-guide/colocation-join.html
index 2aa445e..c336923 100644
--- a/content/documentation/cn/administrator-guide/colocation-join.html
+++ b/content/documentation/cn/administrator-guide/colocation-join.html
@@ -110,7 +110,7 @@
<li class="toctree-l3"><a class="reference internal" href="dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/config/fe_config.html b/content/documentation/cn/administrator-guide/config/fe_config.html
index f4b3568..67f1154 100644
--- a/content/documentation/cn/administrator-guide/config/fe_config.html
+++ b/content/documentation/cn/administrator-guide/config/fe_config.html
@@ -105,7 +105,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/config/index.html b/content/documentation/cn/administrator-guide/config/index.html
index 0873dfd..9995694 100644
--- a/content/documentation/cn/administrator-guide/config/index.html
+++ b/content/documentation/cn/administrator-guide/config/index.html
@@ -105,7 +105,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/dynamic-partition.html b/content/documentation/cn/administrator-guide/dynamic-partition.html
index c95ddc3..974771c 100644
--- a/content/documentation/cn/administrator-guide/dynamic-partition.html
+++ b/content/documentation/cn/administrator-guide/dynamic-partition.html
@@ -108,7 +108,7 @@
</li>
<li class="toctree-l3"><a class="reference internal" href="export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/export-manual.html b/content/documentation/cn/administrator-guide/export-manual.html
index 660a75c..3d5fa95 100644
--- a/content/documentation/cn/administrator-guide/export-manual.html
+++ b/content/documentation/cn/administrator-guide/export-manual.html
@@ -110,7 +110,7 @@
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/http-actions/cancel-label.html b/content/documentation/cn/administrator-guide/http-actions/cancel-label.html
index 60906c8..716600d 100644
--- a/content/documentation/cn/administrator-guide/http-actions/cancel-label.html
+++ b/content/documentation/cn/administrator-guide/http-actions/cancel-label.html
@@ -109,7 +109,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/http-actions/compaction-action.html b/content/documentation/cn/administrator-guide/http-actions/compaction-action.html
index b28bb7f..496fe88 100644
--- a/content/documentation/cn/administrator-guide/http-actions/compaction-action.html
+++ b/content/documentation/cn/administrator-guide/http-actions/compaction-action.html
@@ -109,7 +109,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/http-actions/fe-get-log-file.html b/content/documentation/cn/administrator-guide/http-actions/fe-get-log-file.html
index 67811c6..1817006 100644
--- a/content/documentation/cn/administrator-guide/http-actions/fe-get-log-file.html
+++ b/content/documentation/cn/administrator-guide/http-actions/fe-get-log-file.html
@@ -109,7 +109,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/http-actions/get-label-state.html b/content/documentation/cn/administrator-guide/http-actions/get-label-state.html
index 03745ee..8bfe18a 100644
--- a/content/documentation/cn/administrator-guide/http-actions/get-label-state.html
+++ b/content/documentation/cn/administrator-guide/http-actions/get-label-state.html
@@ -109,7 +109,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/http-actions/index.html b/content/documentation/cn/administrator-guide/http-actions/index.html
index ea65717..0596887 100644
--- a/content/documentation/cn/administrator-guide/http-actions/index.html
+++ b/content/documentation/cn/administrator-guide/http-actions/index.html
@@ -109,7 +109,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/http-actions/restore-tablet.html b/content/documentation/cn/administrator-guide/http-actions/restore-tablet.html
index 3dd6919..74bf760 100644
--- a/content/documentation/cn/administrator-guide/http-actions/restore-tablet.html
+++ b/content/documentation/cn/administrator-guide/http-actions/restore-tablet.html
@@ -109,7 +109,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/index.html b/content/documentation/cn/administrator-guide/index.html
index 858a9ef..0436cfa 100644
--- a/content/documentation/cn/administrator-guide/index.html
+++ b/content/documentation/cn/administrator-guide/index.html
@@ -102,7 +102,7 @@
<li class="toctree-l3"><a class="reference internal" href="dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="time-zone.html">时区</a></li>
@@ -197,7 +197,7 @@
<li class="toctree-l1"><a class="reference internal" href="dynamic-partition.html">动态分区</a></li>
<li class="toctree-l1"><a class="reference internal" href="export-manual.html">数据导出</a></li>
<li class="toctree-l1"><a class="reference internal" href="privilege.html">权限管理</a></li>
-<li class="toctree-l1"><a class="reference internal" href="segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l1"><a class="reference internal" href="segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l1"><a class="reference internal" href="small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l1"><a class="reference internal" href="sql-mode.html">SQL MODE</a></li>
<li class="toctree-l1"><a class="reference internal" href="time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/load-data/broker-load-manual.html b/content/documentation/cn/administrator-guide/load-data/broker-load-manual.html
index 8f3f7b5..d08398b 100644
--- a/content/documentation/cn/administrator-guide/load-data/broker-load-manual.html
+++ b/content/documentation/cn/administrator-guide/load-data/broker-load-manual.html
@@ -96,6 +96,7 @@
<li class="toctree-l4"><a class="reference internal" href="stream-load-manual.html">Stream load</a></li>
<li class="toctree-l4"><a class="reference internal" href="routine-load-manual.html">Routine Load</a></li>
<li class="toctree-l4"><a class="reference internal" href="insert-into-manual.html">Insert Into</a></li>
+<li class="toctree-l4"><a class="reference internal" href="delete-manual.html">Delete</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">表结构变更</a></li>
@@ -109,7 +110,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/load-data/delete-manual.html b/content/documentation/cn/administrator-guide/load-data/delete-manual.html
new file mode 100644
index 0000000..dbfc5a8
--- /dev/null
+++ b/content/documentation/cn/administrator-guide/load-data/delete-manual.html
@@ -0,0 +1,426 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Delete — Doris Documentations 0.11.0 documentation</title>
+
+
+
+
+
+
+
+
+ <script type="text/javascript" src="../../../../_static/js/modernizr.min.js"></script>
+
+
+ <script type="text/javascript" id="documentation_options" data-url_root="../../../../" src="../../../../_static/documentation_options.js"></script>
+ <script type="text/javascript" src="../../../../_static/jquery.js"></script>
+ <script type="text/javascript" src="../../../../_static/underscore.js"></script>
+ <script type="text/javascript" src="../../../../_static/doctools.js"></script>
+ <script type="text/javascript" src="../../../../_static/language_data.js"></script>
+
+ <script type="text/javascript" src="../../../../_static/js/theme.js"></script>
+
+
+
+
+ <link rel="stylesheet" href="../../../../_static/css/theme.css" type="text/css" />
+ <link rel="stylesheet" href="../../../../_static/pygments.css" type="text/css" />
+ <link rel="index" title="Index" href="../../../../genindex.html" />
+ <link rel="search" title="Search" href="../../../../search.html" />
+ <link rel="next" title="表结构变更" href="../alter-table/index.html" />
+ <link rel="prev" title="Insert Into" href="insert-into-manual.html" />
+</head>
+
+<body class="wy-body-for-nav">
+
+
+ <div class="wy-grid-for-nav">
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-scroll">
+ <div class="wy-side-nav-search" >
+
+
+
+ <a href="../../../../index.html" class="icon icon-home"> Doris Documentations
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 0.11.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+
+
+
+ <ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="../../index.html">中文</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="../../downloads/index.html">下载</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../installing/index.html">编译与部署</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../getting-started/index.html">开始使用</a></li>
+<li class="toctree-l2 current"><a class="reference internal" href="../index.html">操作手册</a><ul class="current">
+<li class="toctree-l3 current"><a class="reference internal" href="index.html">数据导入</a><ul class="current">
+<li class="toctree-l4"><a class="reference internal" href="load-manual.html">导入总览</a></li>
+<li class="toctree-l4"><a class="reference internal" href="broker-load-manual.html">Broker Load</a></li>
+<li class="toctree-l4"><a class="reference internal" href="stream-load-manual.html">Stream load</a></li>
+<li class="toctree-l4"><a class="reference internal" href="routine-load-manual.html">Routine Load</a></li>
+<li class="toctree-l4"><a class="reference internal" href="insert-into-manual.html">Insert Into</a></li>
+<li class="toctree-l4 current"><a class="current reference internal" href="#">Delete</a></li>
+</ul>
+</li>
+<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">表结构变更</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../materialized-view/index.html">物化视图</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../http-actions/index.html">HTTP API</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../operation/index.html">运维操作</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../config/index.html">配置文件</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../backup-restore.html">备份与恢复</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../broker.html">Broker</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../colocation-join.html">Colocation Join</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../variables.html">变量</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="../../extending-doris/index.html">扩展功能</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../internal/index.html">设计文档</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../sql-reference/index.html">SQL 手册</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../developer-guide/index.html">开发者手册</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../community/index.html">Apache 社区</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../../../en/index.html">English</a></li>
+</ul>
+
+
+
+ </div>
+ </div>
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" aria-label="top navigation">
+
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../../../../index.html">Doris Documentations</a>
+
+ </nav>
+
+
+ <div class="wy-nav-content">
+
+ <div class="rst-content">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<div role="navigation" aria-label="breadcrumbs navigation">
+
+ <ul class="wy-breadcrumbs">
+
+ <li><a href="../../../../index.html">Docs</a> »</li>
+
+ <li><a href="../../index.html">中文</a> »</li>
+
+ <li><a href="../index.html">操作手册</a> »</li>
+
+ <li><a href="index.html">数据导入</a> »</li>
+
+ <li>Delete</li>
+
+
+ <li class="wy-breadcrumbs-aside">
+
+
+
+ <a href="https://github.com/apache/incubator-doris/blob/master/docs/documentation/cn/administrator-guide/load-data/delete-manual.md" class="fa fa-github"> Edit on GitHub</a>
+
+
+
+ </li>
+
+ </ul>
+
+
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <!--
+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.
+--><div class="section" id="delete">
+<h1>Delete<a class="headerlink" href="#delete" title="Permalink to this headline">¶</a></h1>
+<p>Delete不同于其他导入方式，它是一个同步过程。和Insert into相似，所有的Delete操作在Doris中是一个独立的导入作业，一般Delete语句需要指定表和分区以及删除的条件来筛选要删除的数据，并将会同时删除base表和rollup表的数据。</p>
+<div class="section" id="id1">
+<h2>语法<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
+<p>主要的Delete语法如下：</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">DELETE</span> <span class="n">FROM</span> <span class="n">table_name</span> <span class="p">[</span><span class="n">PARTITION</span> <span class="n">partition_name</span><span class="p">]</span>
+<span class="n">WHERE</span>
+<span class="n">column_name1</span> <span class="n">op</span> <span class="n">value</span><span class="p">[</span> <span class="n">AND</span> <span class="n">column_name2</span> <span class="n">op</span> <span class="n">value</span> <span class="o">...</span><span class="p">];</span>
+</pre></div>
+</div>
+<p>示例1：</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">DELETE</span> <span class="n">FROM</span> <span class="n">my_table</span> <span class="n">PARTITION</span> <span class="n">p1</span> <span class="n">WHERE</span> <span class="n">k1</span> <span class="o">=</span> <span class="mi">3</span><span class="p">;</span>
+</pre></div>
+</div>
+<p>示例2:</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">DELETE</span> <span class="n">FROM</span> <span class="n">my_table</span> <span class="n">PARTITION</span> <span class="n">p1</span> <span class="n">WHERE</span> <span class="n">k1</span> <span class="o"><</span> <span class="mi">3</span> <span class="n">AND</span> <span class="n">k2</span> <span class="o">=</span> <span class="s2">"abc"</span><span class="p">;</span>
+</pre></div>
+</div>
+<p>下面介绍删除语句中使用到的参数：</p>
+<ul>
+<li><p class="first">PARTITION</p>
+<p>Delete语句的目标分区，若未指定，则此表必须为单分区表，否则无法delete</p>
+</li>
+<li><p class="first">WHERE</p>
+<p>Delete语句的条件语句，所有删除语句都必须指定WHERE语句</p>
+</li>
+</ul>
+<p>说明：</p>
+<ol class="simple">
+<li><code class="docutils literal notranslate"><span class="pre">Where</span></code>语句中的op的类型可包括<code class="docutils literal notranslate"><span class="pre">=,>,<,>=,<=,!=</span></code>，目前暂时不支持 where key in (value1, value2, value3) 的方式选定范围，后续将加上此功能。</li>
+<li><code class="docutils literal notranslate"><span class="pre">Where</span></code>语句中的列只能是<code class="docutils literal notranslate"><span class="pre">key</span></code>列</li>
+<li>当选定的<code class="docutils literal notranslate"><span class="pre">key</span></code>列不存在某个rollup表内时，无法进行delete</li>
+<li>条件语句中各个条件只能是<code class="docutils literal notranslate"><span class="pre">and</span></code>关系，如希望达成<code class="docutils literal notranslate"><span class="pre">or</span></code>可将条件分别写入两个delete语句中</li>
+<li>如果指定表为RANGE分区表，则必须指定 <code class="docutils literal notranslate"><span class="pre">PARTITION</span></code>。如果是单分区表，可以不指定。</li>
+<li>不同于Insert into命令，delete不能手动指定<code class="docutils literal notranslate"><span class="pre">label</span></code>，有关label的概念可以查看[Insert Into文档] (./insert-into-manual.md)</li>
+</ol>
+</div>
+<div class="section" id="id2">
+<h2>返回结果<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2>
+<p>Delete命令是一个SQL命令，返回结果是同步的，分为以下几种：</p>
+<ol>
+<li><p class="first">执行成功</p>
+<p>如果Delete顺利执行完成并可见，将返回下列结果，<code class="docutils literal notranslate"><span class="pre">Query</span> <span class="pre">OK</span></code>表示成功</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">mysql</span><span class="o">></span> <span class="n">delete</span> <span class="kn">from</span> <span class="nn">test_tbl</span> <span class="n">PARTITION</span> <span class="n">p1</span> <span class="n">where</span> <span class="n">k1</span> <span class="o">=</span> <span class="mi">1</span><span class="p">;</span>
+<span class="n">Query</span> <span class="n">OK</span><span class="p">,</span> <span class="mi">0</span> <span class="n">rows</span> <span class="n">affected</span> <span class="p">(</span><span class="mf">0.04</span> <span class="n">sec</span><span class="p">)</span>
+<span class="p">{</span><span class="s1">'label'</span><span class="p">:</span><span class="s1">'delete_e7830c72-eb14-4cb9-bbb6-eebd4511d251'</span><span class="p">,</span> <span class="s1">'status'</span><span class="p">:</span><span class="s1">'VISIBLE'</span><span class="p">,</span> <span class="s1">'txnId'</span><span class="p">:</span><span class="s1">'4005'</span><span class="p">}</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">提交成功，但未可见</p>
+<p>Doris的事务提交分为两步：提交和发布版本，只有完成了发布版本步骤，结果才对用户是可见的。若已经提交成功了，那么就可以认为最终一定会发布成功，Doris会尝试在提交完后等待发布一段时间，如果超时后即使发布版本还未完成也会优先返回给用户，提示用户提交已经完成。若如果Delete已经提交并执行，但是仍未发布版本和可见，将返回下列结果</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">mysql</span><span class="o">></span> <span class="n">delete</span> <span class="kn">from</span> <span class="nn">test_tbl</span> <span class="n">PARTITION</span> <span class="n">p1</span> <span class="n">where</span> <span class="n">k1</span> <span class="o">=</span> <span class="mi">1</span><span class="p">;</span>
+<span class="n">Query</span> <span class="n">OK</span><span class="p">,</span> <span class="mi">0</span> <span class="n">rows</span> <span class="n">affected</span> <span class="p">(</span><span class="mf">0.04</span> <span class="n">sec</span><span class="p">)</span>
+<span class="p">{</span><span class="s1">'label'</span><span class="p">:</span><span class="s1">'delete_e7830c72-eb14-4cb9-bbb6-eebd4511d251'</span><span class="p">,</span> <span class="s1">'status'</span><span class="p">:</span><span class="s1">'VISIBLE'</span><span class="p">,</span> <span class="s1">'txnId'</span><span class="p">:</span><span class="s1">'4005'</span><span class="p">,</span> <span class="s1">'err'</span><span clas [...]
+</pre></div>
+</div>
+<p>结果会同时返回一个json字符串：</p>
+<p><code class="docutils literal notranslate"><span class="pre">affected</span> <span class="pre">rows</span></code>表示此次删除影响的行，由于Doris的删除目前是逻辑删除，因此对于这个值是恒为0。</p>
+<p><code class="docutils literal notranslate"><span class="pre">label</span></code>为自动生成的 label，是该导入作业的标识。每个导入作业，都有一个在单 database 内部唯一的 Label。</p>
+<p><code class="docutils literal notranslate"><span class="pre">status</span></code>表示数据删除是否可见，如果可见，显示<code class="docutils literal notranslate"><span class="pre">VISIBLE</span></code>，如果不可见,显示<code class="docutils literal notranslate"><span class="pre">COMMITTED</span></code>。</p>
+<p><code class="docutils literal notranslate"><span class="pre">txnId</span></code>为这个Delete job对应的事务id</p>
+<p><code class="docutils literal notranslate"><span class="pre">err</span></code>字段会显示一些本次删除的详细信息</p>
+</li>
+<li><p class="first">提交失败，事务取消</p>
+<p>如果Delete语句没有提交成功，将会被Doris自动中止，返回下列结果</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">mysql</span><span class="o">></span> <span class="n">delete</span> <span class="kn">from</span> <span class="nn">test_tbl</span> <span class="n">partition</span> <span class="n">p1</span> <span class="n">where</span> <span class="n">k1</span> <span class="o">></span> <span class="mi">80</span><span class="p">;</span>
+<span class="n">ERROR</span> <span class="mi">1064</span> <span class="p">(</span><span class="n">HY000</span><span class="p">):</span> <span class="n">errCode</span> <span class="o">=</span> <span class="mi">2</span><span class="p">,</span> <span class="n">detailMessage</span> <span class="o">=</span> <span class="p">{</span><span class="n">错误原因</span><span class="p">}</span>
+</pre></div>
+</div>
+<p>示例：</p>
+<p>比如说一个超时的删除，将会返回timeout时间和未完成的<code class="docutils literal notranslate"><span class="pre">(tablet=replica)</span></code></p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">mysql</span><span class="o">></span> <span class="n">delete</span> <span class="kn">from</span> <span class="nn">test_tbl</span> <span class="n">partition</span> <span class="n">p1</span> <span class="n">where</span> <span class="n">k1</span> <span class="o">></span> <span class="mi">80</span><span class="p">;</span>
+<span class="n">ERROR</span> <span class="mi">1064</span> <span class="p">(</span><span class="n">HY000</span><span class="p">):</span> <span class="n">errCode</span> <span class="o">=</span> <span class="mi">2</span><span class="p">,</span> <span class="n">detailMessage</span> <span class="o">=</span> <span class="n">failed</span> <span class="n">to</span> <span class="n">delete</span> <span class="n">replicas</span> <span class="kn">from</span> <span class="nn">job</span><span class="p [...]
+</pre></div>
+</div>
+<p><strong>综上，对于Delete操作返回结果的正确处理逻辑为：</strong></p>
+<ol class="simple">
+<li>如果返回结果为<code class="docutils literal notranslate"><span class="pre">ERROR</span> <span class="pre">1064</span> <span class="pre">(HY000)</span></code>，则表示删除失败</li>
+<li>如果返回结果为<code class="docutils literal notranslate"><span class="pre">Query</span> <span class="pre">OK</span></code>，则表示删除执行成功<ol>
+<li>如果<code class="docutils literal notranslate"><span class="pre">status</span></code>为<code class="docutils literal notranslate"><span class="pre">COMMITTED</span></code>，表示数据仍不可见，用户可以稍等一段时间再用<code class="docutils literal notranslate"><span class="pre">show</span> <span class="pre">delete</span></code>命令查看结果</li>
+<li>如果<code class="docutils literal notranslate"><span class="pre">status</span></code>为<code class="docutils literal notranslate"><span class="pre">VISIBLE</span></code>，表示数据删除成功。</li>
+</ol>
+</li>
+</ol>
+</li>
+</ol>
+</div>
+<div class="section" id="id3">
+<h2>可配置项<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="fe">
+<h3>FE配置<a class="headerlink" href="#fe" title="Permalink to this headline">¶</a></h3>
+<p><strong>TIMEOUT配置</strong></p>
+<p>总体来说，Doris的删除作业的超时时间限制在30秒到5分钟时间内，具体时间可通过下面配置项调整</p>
+<ul>
+<li><p class="first">tablet_delete_timeout_second</p>
+<p>delete自身的超时时间是可受指定分区下tablet的数量弹性改变的，此项配置为平均一个tablet所贡献的timeout时间，默认值为2。</p>
+<p>假设此次删除所指定分区下有5个tablet，那么可提供给delete的timeout时间为10秒，由于低于最低超时时间30秒，因此最终超时时间为30秒。</p>
+</li>
+<li><p class="first">load_straggler_wait_second</p>
+<p>如果用户预估的数据量确实比较大，使得5分钟的上限不足时，用户可以通过此项调整timeout上限，默认值为300。</p>
+<p><strong>TIMEOUT的具体计算规则为(秒)</strong></p>
+<p><code class="docutils literal notranslate"><span class="pre">TIMEOUT</span> <span class="pre">=</span> <span class="pre">MIN(load_straggler_wait_second,</span> <span class="pre">MAX(30,</span> <span class="pre">tablet_delete_timeout_second</span> <span class="pre">*</span> <span class="pre">tablet_num))</span></code></p>
+</li>
+<li><p class="first">query_timeout</p>
+<p>因为delete本身是一个SQL命令，因此删除语句也会受session限制，timeout还受Session中的<code class="docutils literal notranslate"><span class="pre">query_timeout</span></code>值影响，可以通过<code class="docutils literal notranslate"><span class="pre">SET</span> <span class="pre">query_timeout</span> <span class="pre">=</span> <span class="pre">xxx</span></code>来增加超时时间，单位是秒。</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="section" id="id4">
+<h2>查看历史记录<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h2>
+<ol>
+<li><p class="first">用户可以通过show delete语句查看历史上已执行完成的删除记录</p>
+<p>语法</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">SHOW</span> <span class="n">DELETE</span> <span class="p">[</span><span class="n">FROM</span> <span class="n">db_name</span><span class="p">]</span>
+</pre></div>
+</div>
+<p>示例</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">mysql</span><span class="o">></span> <span class="n">show</span> <span class="n">delete</span> <span class="kn">from</span> <span class="nn">test_db</span><span class="p">;</span>
+<span class="o">+-----------+---------------+---------------------+-----------------+----------+</span>
+<span class="o">|</span> <span class="n">TableName</span> <span class="o">|</span> <span class="n">PartitionName</span> <span class="o">|</span> <span class="n">CreateTime</span> <span class="o">|</span> <span class="n">DeleteCondition</span> <span class="o">|</span> <span class="n">State</span> <span class="o">|</span>
+<span class="o">+-----------+---------------+---------------------+-----------------+----------+</span>
+<span class="o">|</span> <span class="n">empty_tbl</span> <span class="o">|</span> <span class="n">p3</span> <span class="o">|</span> <span class="mi">2020</span><span class="o">-</span><span class="mi">04</span><span class="o">-</span><span class="mi">15</span> <span class="mi">23</span><span class="p">:</span><span class="mi">09</span><span class="p">:</span><span class="mi">35</span> <span class="o">|</span> <span class="n">k1</span> <span class="n">EQ</span> <span class="s [...]
+<span class="o">|</span> <span class="n">test_tbl</span> <span class="o">|</span> <span class="n">p4</span> <span class="o">|</span> <span class="mi">2020</span><span class="o">-</span><span class="mi">04</span><span class="o">-</span><span class="mi">15</span> <span class="mi">23</span><span class="p">:</span><span class="mi">09</span><span class="p">:</span><span class="mi">53</span> <span class="o">|</span> <span class="n">k1</span> <span class="n">GT</span> <span class="s [...]
+<span class="o">+-----------+---------------+---------------------+-----------------+----------+</span>
+<span class="mi">2</span> <span class="n">rows</span> <span class="ow">in</span> <span class="nb">set</span> <span class="p">(</span><span class="mf">0.00</span> <span class="n">sec</span><span class="p">)</span>
+</pre></div>
+</div>
+</li>
+</ol>
+</div>
+</div>
+
+
+ </div>
+
+ </div>
+ <!--
+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.
+-->
+
+<footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="../alter-table/index.html" class="btn btn-neutral float-right" title="表结构变更" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="insert-into-manual.html" class="btn btn-neutral float-left" title="Insert Into" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2019, Apache Doris(Incubating)
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/rtfd/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+<div role="contentinfo">
+ <p></p>
+ <p>
+
+ Apache Doris(incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicat [...]
+
+ </p>
+</div>
+
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.Navigation.enable(true);
+ });
+ </script>
+
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/content/documentation/cn/administrator-guide/load-data/index.html b/content/documentation/cn/administrator-guide/load-data/index.html
index 79977b2..18306f9 100644
--- a/content/documentation/cn/administrator-guide/load-data/index.html
+++ b/content/documentation/cn/administrator-guide/load-data/index.html
@@ -96,6 +96,7 @@
<li class="toctree-l4"><a class="reference internal" href="stream-load-manual.html">Stream load</a></li>
<li class="toctree-l4"><a class="reference internal" href="routine-load-manual.html">Routine Load</a></li>
<li class="toctree-l4"><a class="reference internal" href="insert-into-manual.html">Insert Into</a></li>
+<li class="toctree-l4"><a class="reference internal" href="delete-manual.html">Delete</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">表结构变更</a></li>
@@ -109,7 +110,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
@@ -241,6 +242,13 @@
<li class="toctree-l2"><a class="reference internal" href="insert-into-manual.html#id9">常见问题</a></li>
</ul>
</li>
+<li class="toctree-l1"><a class="reference internal" href="delete-manual.html">Delete</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="delete-manual.html#id1">语法</a></li>
+<li class="toctree-l2"><a class="reference internal" href="delete-manual.html#id2">返回结果</a></li>
+<li class="toctree-l2"><a class="reference internal" href="delete-manual.html#id3">可配置项</a></li>
+<li class="toctree-l2"><a class="reference internal" href="delete-manual.html#id4">查看历史记录</a></li>
+</ul>
+</li>
</ul>
</div>
</div>
diff --git a/content/documentation/cn/administrator-guide/load-data/insert-into-manual.html b/content/documentation/cn/administrator-guide/load-data/insert-into-manual.html
index 812f155..d5c7ad8 100644
--- a/content/documentation/cn/administrator-guide/load-data/insert-into-manual.html
+++ b/content/documentation/cn/administrator-guide/load-data/insert-into-manual.html
@@ -35,7 +35,7 @@
<link rel="stylesheet" href="../../../../_static/pygments.css" type="text/css" />
<link rel="index" title="Index" href="../../../../genindex.html" />
<link rel="search" title="Search" href="../../../../search.html" />
- <link rel="next" title="表结构变更" href="../alter-table/index.html" />
+ <link rel="next" title="Delete" href="delete-manual.html" />
<link rel="prev" title="Routine Load" href="routine-load-manual.html" />
</head>
@@ -96,6 +96,7 @@
<li class="toctree-l4"><a class="reference internal" href="stream-load-manual.html">Stream load</a></li>
<li class="toctree-l4"><a class="reference internal" href="routine-load-manual.html">Routine Load</a></li>
<li class="toctree-l4 current"><a class="current reference internal" href="#">Insert Into</a></li>
+<li class="toctree-l4"><a class="reference internal" href="delete-manual.html">Delete</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">表结构变更</a></li>
@@ -109,7 +110,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
@@ -470,7 +471,7 @@ under the License.
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="../alter-table/index.html" class="btn btn-neutral float-right" title="表结构变更" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="delete-manual.html" class="btn btn-neutral float-right" title="Delete" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="routine-load-manual.html" class="btn btn-neutral float-left" title="Routine Load" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
diff --git a/content/documentation/cn/administrator-guide/load-data/load-manual.html b/content/documentation/cn/administrator-guide/load-data/load-manual.html
index 40681d7..bd5cf02 100644
--- a/content/documentation/cn/administrator-guide/load-data/load-manual.html
+++ b/content/documentation/cn/administrator-guide/load-data/load-manual.html
@@ -96,6 +96,7 @@
<li class="toctree-l4"><a class="reference internal" href="stream-load-manual.html">Stream load</a></li>
<li class="toctree-l4"><a class="reference internal" href="routine-load-manual.html">Routine Load</a></li>
<li class="toctree-l4"><a class="reference internal" href="insert-into-manual.html">Insert Into</a></li>
+<li class="toctree-l4"><a class="reference internal" href="delete-manual.html">Delete</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">表结构变更</a></li>
@@ -109,7 +110,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/load-data/routine-load-manual.html b/content/documentation/cn/administrator-guide/load-data/routine-load-manual.html
index d997ecf..23fe12b 100644
--- a/content/documentation/cn/administrator-guide/load-data/routine-load-manual.html
+++ b/content/documentation/cn/administrator-guide/load-data/routine-load-manual.html
@@ -96,6 +96,7 @@
<li class="toctree-l4"><a class="reference internal" href="stream-load-manual.html">Stream load</a></li>
<li class="toctree-l4 current"><a class="current reference internal" href="#">Routine Load</a></li>
<li class="toctree-l4"><a class="reference internal" href="insert-into-manual.html">Insert Into</a></li>
+<li class="toctree-l4"><a class="reference internal" href="delete-manual.html">Delete</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">表结构变更</a></li>
@@ -109,7 +110,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/load-data/stream-load-manual.html b/content/documentation/cn/administrator-guide/load-data/stream-load-manual.html
index 3f3b90f..5c68af9 100644
--- a/content/documentation/cn/administrator-guide/load-data/stream-load-manual.html
+++ b/content/documentation/cn/administrator-guide/load-data/stream-load-manual.html
@@ -96,6 +96,7 @@
<li class="toctree-l4 current"><a class="current reference internal" href="#">Stream load</a></li>
<li class="toctree-l4"><a class="reference internal" href="routine-load-manual.html">Routine Load</a></li>
<li class="toctree-l4"><a class="reference internal" href="insert-into-manual.html">Insert Into</a></li>
+<li class="toctree-l4"><a class="reference internal" href="delete-manual.html">Delete</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">表结构变更</a></li>
@@ -109,7 +110,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/materialized-view/index.html b/content/documentation/cn/administrator-guide/materialized-view/index.html
index 5d448a5..1175d54 100644
--- a/content/documentation/cn/administrator-guide/materialized-view/index.html
+++ b/content/documentation/cn/administrator-guide/materialized-view/index.html
@@ -104,7 +104,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/operation/disk-capacity.html b/content/documentation/cn/administrator-guide/operation/disk-capacity.html
index 4742e8b..6d4c4b9 100644
--- a/content/documentation/cn/administrator-guide/operation/disk-capacity.html
+++ b/content/documentation/cn/administrator-guide/operation/disk-capacity.html
@@ -111,7 +111,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/operation/index.html b/content/documentation/cn/administrator-guide/operation/index.html
index d681370..a650c0c 100644
--- a/content/documentation/cn/administrator-guide/operation/index.html
+++ b/content/documentation/cn/administrator-guide/operation/index.html
@@ -111,7 +111,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/operation/metadata-operation.html b/content/documentation/cn/administrator-guide/operation/metadata-operation.html
index d496c98..e4cce46 100644
--- a/content/documentation/cn/administrator-guide/operation/metadata-operation.html
+++ b/content/documentation/cn/administrator-guide/operation/metadata-operation.html
@@ -111,7 +111,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/operation/monitor-alert.html b/content/documentation/cn/administrator-guide/operation/monitor-alert.html
index b415efc..c780580 100644
--- a/content/documentation/cn/administrator-guide/operation/monitor-alert.html
+++ b/content/documentation/cn/administrator-guide/operation/monitor-alert.html
@@ -111,7 +111,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/operation/multi-tenant.html b/content/documentation/cn/administrator-guide/operation/multi-tenant.html
index 68d5054..eecfa32 100644
--- a/content/documentation/cn/administrator-guide/operation/multi-tenant.html
+++ b/content/documentation/cn/administrator-guide/operation/multi-tenant.html
@@ -111,7 +111,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/operation/tablet-meta-tool.html b/content/documentation/cn/administrator-guide/operation/tablet-meta-tool.html
index b83be82..aa48d49 100644
--- a/content/documentation/cn/administrator-guide/operation/tablet-meta-tool.html
+++ b/content/documentation/cn/administrator-guide/operation/tablet-meta-tool.html
@@ -111,7 +111,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/operation/tablet-repair-and-balance.html b/content/documentation/cn/administrator-guide/operation/tablet-repair-and-balance.html
index d56f6c2..76d12c0 100644
--- a/content/documentation/cn/administrator-guide/operation/tablet-repair-and-balance.html
+++ b/content/documentation/cn/administrator-guide/operation/tablet-repair-and-balance.html
@@ -111,7 +111,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/operation/tablet-restore-tool.html b/content/documentation/cn/administrator-guide/operation/tablet-restore-tool.html
index dda0235..8708412 100644
--- a/content/documentation/cn/administrator-guide/operation/tablet-restore-tool.html
+++ b/content/documentation/cn/administrator-guide/operation/tablet-restore-tool.html
@@ -111,7 +111,7 @@
<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="../export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="../privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="../sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="../time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/administrator-guide/privilege.html b/content/documentation/cn/administrator-guide/privilege.html
index 8e9fc2c..61515d5 100644
--- a/content/documentation/cn/administrator-guide/privilege.html
+++ b/content/documentation/cn/administrator-guide/privilege.html
@@ -35,7 +35,7 @@
<link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
<link rel="index" title="Index" href="../../../genindex.html" />
<link rel="search" title="Search" href="../../../search.html" />
- <link rel="next" title="Doris Segment V2上线和试用手册" href="segment-v2-usage.html" />
+ <link rel="next" title="Segment V2 升级手册" href="segment-v2-usage.html" />
<link rel="prev" title="数据导出" href="export-manual.html" />
</head>
@@ -111,7 +111,7 @@
<li class="toctree-l4"><a class="reference internal" href="#id7">最佳实践</a></li>
</ul>
</li>
-<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="time-zone.html">时区</a></li>
@@ -413,7 +413,7 @@ under the License.
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="segment-v2-usage.html" class="btn btn-neutral float-right" title="Doris Segment V2上线和试用手册" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="segment-v2-usage.html" class="btn btn-neutral float-right" title="Segment V2 升级手册" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="export-manual.html" class="btn btn-neutral float-left" title="数据导出" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
diff --git a/content/documentation/cn/administrator-guide/segment-v2-usage.html b/content/documentation/cn/administrator-guide/segment-v2-usage.html
index 52c734a..77f041f 100644
--- a/content/documentation/cn/administrator-guide/segment-v2-usage.html
+++ b/content/documentation/cn/administrator-guide/segment-v2-usage.html
@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Doris Segment V2上线和试用手册 — Doris Documentations 0.11.0 documentation</title>
+ <title>Segment V2 升级手册 — Doris Documentations 0.11.0 documentation</title>
@@ -102,9 +102,10 @@
<li class="toctree-l3"><a class="reference internal" href="dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="privilege.html">权限管理</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Doris Segment V2上线和试用手册</a><ul>
+<li class="toctree-l3 current"><a class="current reference internal" href="#">Segment V2 升级手册</a><ul>
<li class="toctree-l4"><a class="reference internal" href="#id1">背景</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#id2">上线</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#id2">集群升级</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#v2">V2 格式转换</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="small-file-mgr.html">文件管理器</a></li>
@@ -170,7 +171,7 @@
<li><a href="index.html">操作手册</a> »</li>
- <li>Doris Segment V2上线和试用手册</li>
+ <li>Segment V2 升级手册</li>
<li class="wy-breadcrumbs-aside">
@@ -191,113 +192,125 @@
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">
- <div class="section" id="doris-segment-v2">
-<h1>Doris Segment V2上线和试用手册<a class="headerlink" href="#doris-segment-v2" title="Permalink to this headline">¶</a></h1>
+ <!--
+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.
+--><div class="section" id="segment-v2">
+<h1>Segment V2 升级手册<a class="headerlink" href="#segment-v2" title="Permalink to this headline">¶</a></h1>
<div class="section" id="id1">
<h2>背景<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
-<p>Doris 0.12版本中实现了segment v2（新的存储格式），引入词典压缩、bitmap索引、page cache等优化，能够提升系统性能。目前0.12版本已经发布alpha版本，正在内部上线过程中，上线的方案和试用方法记录如下</p>
+<p>Doris 0.12 版本中实现了新的存储格式：Segment V2，引入词典压缩、bitmap索引、page cache等优化，能够提升系统性能。</p>
+<p>0.12 版本会同时支持读写原有的 Segment V1（以下简称V1） 和新的 Segment V2（以下简称V2） 两种格式。如果原有数据想使用 V2 相关特性，需通过命令将 V1 转换成 V2 格式。</p>
+<p>本文档主要介绍从 0.11 版本升级至 0.12 版本后，如何转换和使用 V2 格式。</p>
+<p>V2 格式的表可以支持以下新的特性：</p>
+<ol class="simple">
+<li>bitmap 索引</li>
+<li>内存表</li>
+<li>page cache</li>
+<li>字典压缩</li>
+<li>延迟物化（Lazy Materialization）</li>
+</ol>
</div>
<div class="section" id="id2">
-<h2>上线<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2>
-<p>为了保证上线的稳定性，上线分为三个阶段：
-第一个阶段是上线0.12版本，但是不全量开启segment v2的功能，只在验证的时候，创建segment v2的表（或者索引）
-第二个阶段是全量开启segment v2的功能，替换现有的segment存储格式，这样对新表会创建segment v2的格式的存储文件，但是对于旧表，需要依赖于compaction和schema change等过程，实现格式的转化
-第三个阶段就是转化旧的segment格式到新的segment v2的格式，这个需要在验证segment v2的正确性和性能没有问题之后，可以按照用户意愿逐步完成。</p>
-<div class="section" id="id3">
-<h3>上线验证<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<h2>集群升级<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2>
+<p>0.12 版本仅支持从 0.11 版本升级，不支持从 0.11 之前的版本升级。请先确保升级的前的 Doris 集群版本为 0.11。</p>
+<p>0.12 版本有两个 V2 相关的重要参数：</p>
<ul class="simple">
-<li>正确性</li>
+<li><code class="docutils literal notranslate"><span class="pre">default_rowset_type</span></code>：FE 一个全局变量（Global Variable）设置，默认为 “alpha”，即 V1 版本。</li>
+<li><code class="docutils literal notranslate"><span class="pre">default_rowset_type</span></code>：BE 的一个配置项，默认为 “ALPHA”，即 V1 版本。</li>
</ul>
-<p>正确性是segment v2上线最需要保证的指标。 在第一阶段，为了保证线上环境的稳定性，并且验证segment v2的正确性，采用如下的方案：</p>
+<p>保持上述配置默认的话，按常规步骤对集群升级后，原有集群数据的存储格式不会变更，即依然为 V1 格式。如果对 V2 格式没有需求，则继续正常使用集群即可，无需做任何额外操作。所有原有数据、以及新导入的数据，都依然是 V1 版本。</p>
+</div>
+<div class="section" id="v2">
+<h2>V2 格式转换<a class="headerlink" href="#v2" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="id3">
+<h3>已有表数据转换成 V2<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<p>对于已有表数据的格式转换，Doris 提供两种方式：</p>
<ol>
-<li><p class="first">选择几个需要验证的表，使用以下语句，创建segment v2格式的rollup表，该rollup表与base表的schema相同</p>
-<p>alter table table_name add rollup table_name (columns) properties (“storage_format” = “v2”);</p>
-<p>其中，
-rollup后面的index名字直接指定为base table的table name，该语句会自动生成一个__v2_table_name。</p>
-<p>columns可以随便指定一个列名即可，这里一方面是为了兼容现有的语法，一方面是为了方便。</p>
-</li>
-<li><p class="first">上面的创建出来的rollup index名字格式类似：__v2_table_name</p>
-<p>通过命令 :</p>
-<p><code class="docutils literal notranslate"><span class="pre">desc</span> <span class="pre">table_name</span> <span class="pre">all;</span></code></p>
-<p>查看table中是否存在名字：__v2_table_name的rollup。由于创建segment v2的rollup表是一个异步操作，所以并不会立即成功。如果上面命令中并没有显示新创建的 rollup，可能是还在创建过程中。</p>
-<p>可以通过下面命令查看正在进行的 rollup 表。</p>
-<p><code class="docutils literal notranslate"><span class="pre">show</span> <span class="pre">alter</span> <span class="pre">table</span> <span class="pre">rollup;</span></code></p>
-<p>看到会有一个名字为__v2_table_name的rollup表正在创建。</p>
-</li>
-<li><p class="first">通过查询base表和segment v2格式的rollup表，验证查询结果是否一致（查询可以来自audit日志）</p>
-<p>为了让查询使用segment v2的rollup表，增加了一个session变量，通过在查询中使用如下的语句，来查询segment v2格式的index：</p>
-<p>set use_v2_rollup = true;</p>
-<p>比如说，要当前db中有一个simple的表，直接查询如下：</p>
-<div class="highlight-default notranslate"><div class="highlight"><pre><span></span> <span class="n">mysql</span><span class="o">></span> <span class="n">select</span> <span class="o">*</span> <span class="kn">from</span> <span class="nn">simple</span><span class="p">;</span>
- <span class="o">+------+-------+</span>
- <span class="o">|</span> <span class="n">key</span> <span class="o">|</span> <span class="n">value</span> <span class="o">|</span>
- <span class="o">+------+-------+</span>
- <span class="o">|</span> <span class="mi">2</span> <span class="o">|</span> <span class="mi">6</span> <span class="o">|</span>
- <span class="o">|</span> <span class="mi">1</span> <span class="o">|</span> <span class="mi">6</span> <span class="o">|</span>
- <span class="o">|</span> <span class="mi">4</span> <span class="o">|</span> <span class="mi">5</span> <span class="o">|</span>
- <span class="o">+------+-------+</span>
- <span class="mi">3</span> <span class="n">rows</span> <span class="ow">in</span> <span class="nb">set</span> <span class="p">(</span><span class="mf">0.01</span> <span class="n">sec</span><span class="p">)</span>
+<li><p class="first">创建一个 V2 格式的特殊 Rollup</p>
+<p>该方式会针对指定表，创建一个 V2 格式的特殊 Rollup。创建完成后，新的 V2 格式的 Rollup 会和原有表格式数据并存。用户可以指定对 V2 格式的 Rollup 进行查询验证。</p>
+<p>该方式主要用于对 V2 格式的验证，因为不会修改原有表数据，因此可以安全的进行 V2 格式的数据验证，而不用担心表数据因格式转换而损坏。通常先使用这个方式对数据进行校验，之后再使用方法2对整个表进行数据格式转换。</p>
+<p>操作步骤如下：</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="c1">## 创建 V2 格式的 Rollup</span>
+
+<span class="n">ALTER</span> <span class="n">TABLE</span> <span class="n">table_name</span> <span class="n">ADD</span> <span class="n">ROLLUP</span> <span class="n">table_name</span> <span class="p">(</span><span class="n">columns</span><span class="p">)</span> <span class="n">PROPERTIES</span> <span class="p">(</span><span class="s2">"storage_format"</span> <span class="o">=</span> <span class="s2">"v2"</span><span class="p">);</span>
</pre></div>
</div>
-<p>然后使用使用如下的query查询__v2_simpel的rollup表：</p>
-<div class="highlight-default notranslate"><div class="highlight"><pre><span></span> <span class="n">mysql</span><span class="o">></span> <span class="nb">set</span> <span class="n">use_v2_rollup</span> <span class="o">=</span> <span class="n">true</span><span class="p">;</span>
- <span class="n">Query</span> <span class="n">OK</span><span class="p">,</span> <span class="mi">0</span> <span class="n">rows</span> <span class="n">affected</span> <span class="p">(</span><span class="mf">0.04</span> <span class="n">sec</span><span class="p">)</span>
-
- <span class="n">mysql</span><span class="o">></span> <span class="n">select</span> <span class="o">*</span> <span class="kn">from</span> <span class="nn">simple</span><span class="p">;</span>
- <span class="o">+------+-------+</span>
- <span class="o">|</span> <span class="n">key</span> <span class="o">|</span> <span class="n">value</span> <span class="o">|</span>
- <span class="o">+------+-------+</span>
- <span class="o">|</span> <span class="mi">4</span> <span class="o">|</span> <span class="mi">5</span> <span class="o">|</span>
- <span class="o">|</span> <span class="mi">1</span> <span class="o">|</span> <span class="mi">6</span> <span class="o">|</span>
- <span class="o">|</span> <span class="mi">2</span> <span class="o">|</span> <span class="mi">6</span> <span class="o">|</span>
- <span class="o">+------+-------+</span>
- <span class="mi">3</span> <span class="n">rows</span> <span class="ow">in</span> <span class="nb">set</span> <span class="p">(</span><span class="mf">0.01</span> <span class="n">sec</span><span class="p">)</span>
+<p>其中， Rollup 的名称必须为表名。columns 字段可以任意填写，系统不会检查该字段的合法性。该语句会自动生成一个名为 <code class="docutils literal notranslate"><span class="pre">__V2_table_name</span></code> 的 Rollup，并且该 Rollup 列包含表的全部列。</p>
+<p>通过以下语句查看创建进度：</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">SHOW</span> <span class="n">ALTER</span> <span class="n">TABLE</span> <span class="n">ROLLUP</span><span class="p">;</span>
</pre></div>
</div>
-<p>期望的结果是两次查询的结果相同。
-如果结果不一致，需要进行排查。第一步需要定位是否是因为由于两次查询之间有新的导入，导致数据不一致。如果是的话，需要进行重试。如果不是，则需要进一步定位原因。</p>
-</li>
-<li><p class="first">对比同样查询在base表和segment v2的rollup表中的结果是否一致</p>
-</li>
-</ol>
-<ul>
-<li><p class="first">查询延时</p>
-<p>在segment v2中优化了v1中的随机读取，并且增加了bitmap索引、lazy materialization等优化，预计查询延时会有下降，</p>
-</li>
-<li><p class="first">导入延时</p>
-</li>
-<li><p class="first">page cache命中率</p>
-</li>
-<li><p class="first">string类型字段压缩率</p>
-</li>
-<li><p class="first">bitmap索引的性能提升率和空间占用</p>
-</li>
-</ul>
+<p>创建完成后，可以通过 <code class="docutils literal notranslate"><span class="pre">DESC</span> <span class="pre">table_name</span> <span class="pre">ALL;</span></code> 查看到名为 <code class="docutils literal notranslate"><span class="pre">__v2_table_name</span></code> 的 Rollup。</p>
+<p>之后，通过如下命令，切换到 V2 格式查询：</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="nb">set</span> <span class="n">use_v2_rollup</span> <span class="o">=</span> <span class="n">true</span><span class="p">;</span>
+<span class="n">select</span> <span class="o">*</span> <span class="kn">from</span> <span class="nn">table_name</span> <span class="n">limit</span> <span class="mi">10</span><span class="p">;</span>
+</pre></div>
</div>
-<div class="section" id="segment-v2">
-<h3>全量开启segment v2<a class="headerlink" href="#segment-v2" title="Permalink to this headline">¶</a></h3>
-<p>有两个方式：</p>
-<ol>
-<li><p class="first">fe中有一个全局变量，通过设置全局变量default_rowset_type，来设置BE中使用segment v2作为默认的存储格式，命令如下：</p>
-<p>set global default_rowset_type = beta;</p>
-<p>使用这个方式，只需要执行上述命令，之后等待10s左右，FE会将配置同步到BE中。不需要在每个BE中进行配置。推荐使用这个配置。不过该方式目前没有简单的方式来验证BE上的default rowset type是否已经变更，一种办法是建一个表，然后查看对应的表的元数据。但是这样子比较麻烦，后续看需要可以在某个地方实现状态查看。</p>
+<p><code class="docutils literal notranslate"><span class="pre">use_V2_Rollup</span></code> 这个变量会强制查询名为 <code class="docutils literal notranslate"><span class="pre">__V2_table_name</span></code> 的 Rollup，并且不会考虑其他 Rollup 的命中条件。所以该参数仅用于对 V2 格式数据进行验证。</p>
</li>
-<li><p class="first">修改BE中的配置文件中的配置default_rowset_type为BETA。这种方式需要在每个BE中添加对应的配置。</p>
+<li><p class="first">转换现有表数据格式</p>
+<p>该方式相当于给指定的表发送一个 schema change 作业，作业完成后，表的所有数据会被转换成 V2 格式。该方法不会保留原有 v1 格式，所以请先使用方法1进行格式验证。</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">ALTER</span> <span class="n">TABLE</span> <span class="n">table_name</span> <span class="n">SET</span> <span class="p">(</span><span class="s2">"storage_format"</span> <span class="o">=</span> <span class="s2">"v2"</span><span class="p">);</span>
+</pre></div>
+</div>
+<p>之后通过如下命令查看作业进度：</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">SHOW</span> <span class="n">ALTER</span> <span class="n">TABLE</span> <span class="n">COLUMN</span><span class="p">;</span>
+</pre></div>
+</div>
+<p>作业完成后，该表的所有数据（包括Rollup）都转换为了 V2。且 V1 版本的数据已被删除。如果该表是分区表，则之后创建的分区也都是 V2 格式。</p>
+<p><strong>V2 格式的表不能重新转换为 V1</strong></p>
</li>
</ol>
</div>
-<div class="section" id="segment-v1v2">
-<h3>转化segment v1格式为v2<a class="headerlink" href="#segment-v1v2" title="Permalink to this headline">¶</a></h3>
-<p>如果不想等待系统后台自动转换存储格式（比如想要使用bitmap索引、词典压缩），可以手动指定触发某个表的存储格式转换。具体是通过schema change来实现将v1的格式转化为v2的格式：</p>
-<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">alter</span> <span class="n">table</span> <span class="n">table_name</span> <span class="nb">set</span> <span class="p">(</span><span class="s2">"storage_format"</span> <span class="o">=</span> <span class="s2">"v2"</span><span class="p">);</span>
-
-<span class="n">将存储格式转化为v2</span><span class="o">.</span>
+<div class="section" id="id4">
+<h3>创建新的 V2 格式的表<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<p>在不改变默认配置参数的情况下，用户可以创建 V2 格式的表：</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">CREATE</span> <span class="n">TABLE</span> <span class="n">tbl_name</span>
+<span class="p">(</span>
+ <span class="n">k1</span> <span class="n">INT</span><span class="p">,</span>
+ <span class="n">k2</span> <span class="n">INT</span>
+<span class="p">)</span>
+<span class="n">DISTRIBUTED</span> <span class="n">BY</span> <span class="n">HASH</span><span class="p">(</span><span class="n">k1</span><span class="p">)</span> <span class="n">BUCKETS</span> <span class="mi">1</span>
+<span class="n">PROPERTIES</span>
+<span class="p">(</span>
+ <span class="s2">"storage_format"</span> <span class="o">=</span> <span class="s2">"v2"</span>
+<span class="p">);</span>
</pre></div>
</div>
-<p>如果在没有设置默认的存储格式为v2的时候，想要新建一个v2的表，需要按照以下的步骤进行操作：</p>
-<ol class="simple">
-<li>使用create table来创建v1的表</li>
-<li>使用上面的schema change命令进行格式的转化</li>
+<p>在 <code class="docutils literal notranslate"><span class="pre">properties</span></code> 中指定 <code class="docutils literal notranslate"><span class="pre">"storage_format"</span> <span class="pre">=</span> <span class="pre">"v2"</span></code> 后，该表将使用 V2 格式创建。如果是分区表，则之后创建的分区也都是 V2 格式。</p>
+</div>
+<div class="section" id="id5">
+<h3>全量格式转换(试验功能)<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
+<p>通过以下方式可以开启整个集群的全量数据格式转换（V1 -> V2）。全量数据转换是通过 BE 后台的数据 compaction 过程异步进行的。</p>
+<ol>
+<li><p class="first">从 BE 开启全量格式转换</p>
+<p>在 <code class="docutils literal notranslate"><span class="pre">be.conf</span></code> 中添加变量 <code class="docutils literal notranslate"><span class="pre">default_rowset_type=BETA</span></code> 并重启 BE 节点。在之后的 compaction 流程中，数据会自动从 V1 转换成 V2。</p>
+</li>
+<li><p class="first">从 FE 开启全量格式转换</p>
+<p>通过 mysql 客户端连接 Doris 后，执行如下语句：</p>
+<p><code class="docutils literal notranslate"><span class="pre">SET</span> <span class="pre">GLOBAL</span> <span class="pre">default_rowset_type</span> <span class="pre">=</span> <span class="pre">beta;</span></code></p>
+<p>执行完成后，FE 会通过心跳将信息发送给 BE，之后 BE 的 compaction 流程中，数据会自动从 V1 转换成 V2。</p>
+<p>FE 的配置参数优先级高于 BE 的配置。即使 BE 中的配置 <code class="docutils literal notranslate"><span class="pre">default_rowset_type</span></code> 为 ALPHA，如果 FE 配置为 beta 后，则 BE 依然开始进行 V1 到 V2 的数据格式转换。</p>
+<p>**建议先通过对单独表的数据格式转换验证后，再进行全量转换。全量转换的时间比较长，且进度依赖于 compaction 的进度。**可能出现 compaction 无法完成的情况，因此需要通过显式的执行 <code class="docutils literal notranslate"><span class="pre">ALTER</span> <span class="pre">TABLE</span></code> 操作进行个别表的数据格式转换。</p>
+</li>
+<li><p class="first">查看全量转换进度</p>
+<p>全量转换进度须通过脚本查看。脚本位置为代码库的 <code class="docutils literal notranslate"><span class="pre">tools/show_segment_status/</span></code> 目录。请参阅其中的 <code class="docutils literal notranslate"><span class="pre">README</span></code> 文档查看使用帮助。</p>
+</li>
</ol>
</div>
</div>
diff --git a/content/documentation/cn/administrator-guide/small-file-mgr.html b/content/documentation/cn/administrator-guide/small-file-mgr.html
index a121a9e..b1dc7f2 100644
--- a/content/documentation/cn/administrator-guide/small-file-mgr.html
+++ b/content/documentation/cn/administrator-guide/small-file-mgr.html
@@ -36,7 +36,7 @@
<link rel="index" title="Index" href="../../../genindex.html" />
<link rel="search" title="Search" href="../../../search.html" />
<link rel="next" title="SQL MODE" href="sql-mode.html" />
- <link rel="prev" title="Doris Segment V2上线和试用手册" href="segment-v2-usage.html" />
+ <link rel="prev" title="Segment V2 升级手册" href="segment-v2-usage.html" />
</head>
<body class="wy-body-for-nav">
@@ -102,7 +102,7 @@
<li class="toctree-l3"><a class="reference internal" href="dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3 current"><a class="current reference internal" href="#">文件管理器</a><ul>
<li class="toctree-l4"><a class="reference internal" href="#id2">名词解释</a></li>
<li class="toctree-l4"><a class="reference internal" href="#id3">基本概念</a></li>
@@ -333,7 +333,7 @@ under the License.
<a href="sql-mode.html" class="btn btn-neutral float-right" title="SQL MODE" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
- <a href="segment-v2-usage.html" class="btn btn-neutral float-left" title="Doris Segment V2上线和试用手册" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+ <a href="segment-v2-usage.html" class="btn btn-neutral float-left" title="Segment V2 升级手册" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>
diff --git a/content/documentation/cn/administrator-guide/sql-mode.html b/content/documentation/cn/administrator-guide/sql-mode.html
index e1257ee..f90625e 100644
--- a/content/documentation/cn/administrator-guide/sql-mode.html
+++ b/content/documentation/cn/administrator-guide/sql-mode.html
@@ -102,7 +102,7 @@
<li class="toctree-l3"><a class="reference internal" href="dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3 current"><a class="current reference internal" href="#">SQL MODE</a><ul>
<li class="toctree-l4"><a class="reference internal" href="#id1">sql mode 介绍</a></li>
diff --git a/content/documentation/cn/administrator-guide/time-zone.html b/content/documentation/cn/administrator-guide/time-zone.html
index 87d2711..2758c48 100644
--- a/content/documentation/cn/administrator-guide/time-zone.html
+++ b/content/documentation/cn/administrator-guide/time-zone.html
@@ -102,7 +102,7 @@
<li class="toctree-l3"><a class="reference internal" href="dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3 current"><a class="current reference internal" href="#">时区</a><ul>
diff --git a/content/documentation/cn/administrator-guide/variables.html b/content/documentation/cn/administrator-guide/variables.html
index d6b6371..4c17e67 100644
--- a/content/documentation/cn/administrator-guide/variables.html
+++ b/content/documentation/cn/administrator-guide/variables.html
@@ -102,7 +102,7 @@
<li class="toctree-l3"><a class="reference internal" href="dynamic-partition.html">动态分区</a></li>
<li class="toctree-l3"><a class="reference internal" href="export-manual.html">数据导出</a></li>
<li class="toctree-l3"><a class="reference internal" href="privilege.html">权限管理</a></li>
-<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Doris Segment V2上线和试用手册</a></li>
+<li class="toctree-l3"><a class="reference internal" href="segment-v2-usage.html">Segment V2 升级手册</a></li>
<li class="toctree-l3"><a class="reference internal" href="small-file-mgr.html">文件管理器</a></li>
<li class="toctree-l3"><a class="reference internal" href="sql-mode.html">SQL MODE</a></li>
<li class="toctree-l3"><a class="reference internal" href="time-zone.html">时区</a></li>
diff --git a/content/documentation/cn/getting-started/data-partition.html b/content/documentation/cn/getting-started/data-partition.html
index 86976b3..866a7f0 100644
--- a/content/documentation/cn/getting-started/data-partition.html
+++ b/content/documentation/cn/getting-started/data-partition.html
@@ -418,7 +418,7 @@ p201705: [2017-04-01, 2017-06-01)
<li>storage_medium & storage_cooldown_time<ul>
<li>BE 的数据存储目录可以显式的指定为 SSD 或者 HDD（通过 .SSD 或者 .HDD 后缀区分）。建表时，可以统一指定所有 Partition 初始存储的介质。注意，后缀作用是显式指定磁盘介质，而不会检查是否与实际介质类型相符。</li>
<li>默认初始存储介质可通过fe的配置文件 <code class="docutils literal notranslate"><span class="pre">fe.conf</span></code> 中指定 <code class="docutils literal notranslate"><span class="pre">default_storage_medium=xxx</span></code>，如果没有指定，则默认为 HDD。如果指定为 SSD，则数据初始存放在 SSD 上。</li>
-<li>如果没有指定 storage_cooldown_time，则默认 7 天后，数据会从 SSD 自动迁移到 HDD 上。如果指定了 storage_cooldown_time，则在到达 storage_cooldown_time 时间后，数据才会迁移。</li>
+<li>如果没有指定 storage_cooldown_time，则默认 30 天后，数据会从 SSD 自动迁移到 HDD 上。如果指定了 storage_cooldown_time，则在到达 storage_cooldown_time 时间后，数据才会迁移。</li>
<li>注意，当指定 storage_medium 时，该参数只是一个“尽力而为”的设置。即使集群内没有设置 SSD 存储介质，也不会报错，而是自动存储在可用的数据目录中。同样，如果 SSD 介质不可访问、空间不足，都可能导致数据初始直接存储在其他可用介质上。而数据到期迁移到 HDD 时，如果 HDD 介质不可访问、空间不足，也可能迁移失败（但是会不断尝试）。</li>
</ul>
</li>
diff --git a/content/documentation/cn/index.html b/content/documentation/cn/index.html
index 00d91e2..7369b78 100644
--- a/content/documentation/cn/index.html
+++ b/content/documentation/cn/index.html
@@ -457,12 +457,13 @@
<li class="toctree-l3"><a class="reference internal" href="administrator-guide/privilege.html#id7">最佳实践</a></li>
</ul>
</li>
-<li class="toctree-l2"><a class="reference internal" href="administrator-guide/segment-v2-usage.html">Doris Segment V2上线和试用手册</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="administrator-guide/segment-v2-usage.html">Segment V2 升级手册</a><ul>
<li class="toctree-l3"><a class="reference internal" href="administrator-guide/segment-v2-usage.html#id1">背景</a></li>
-<li class="toctree-l3"><a class="reference internal" href="administrator-guide/segment-v2-usage.html#id2">上线</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="administrator-guide/segment-v2-usage.html#id3">上线验证</a></li>
-<li class="toctree-l4"><a class="reference internal" href="administrator-guide/segment-v2-usage.html#segment-v2">全量开启segment v2</a></li>
-<li class="toctree-l4"><a class="reference internal" href="administrator-guide/segment-v2-usage.html#segment-v1v2">转化segment v1格式为v2</a></li>
+<li class="toctree-l3"><a class="reference internal" href="administrator-guide/segment-v2-usage.html#id2">集群升级</a></li>
+<li class="toctree-l3"><a class="reference internal" href="administrator-guide/segment-v2-usage.html#v2">V2 格式转换</a><ul>
+<li class="toctree-l4"><a class="reference internal" href="administrator-guide/segment-v2-usage.html#id3">已有表数据转换成 V2</a></li>
+<li class="toctree-l4"><a class="reference internal" href="administrator-guide/segment-v2-usage.html#id4">创建新的 V2 格式的表</a></li>
+<li class="toctree-l4"><a class="reference internal" href="administrator-guide/segment-v2-usage.html#id5">全量格式转换(试验功能)</a></li>
</ul>
</li>
</ul>
diff --git a/content/documentation/cn/sql-reference/sql-statements/Administration/SHOW INDEX.html b/content/documentation/cn/sql-reference/sql-statements/Administration/SHOW INDEX.html
index acd3084..5b5cf59 100644
--- a/content/documentation/cn/sql-reference/sql-statements/Administration/SHOW INDEX.html
+++ b/content/documentation/cn/sql-reference/sql-statements/Administration/SHOW INDEX.html
@@ -207,7 +207,9 @@ under the License.
<h2>description<a class="headerlink" href="#description" title="Permalink to this headline">¶</a></h2>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>该语句用于展示一个表中索引的相关信息，目前只支持bitmap 索引
语法：
- SHOW INDEX[ES] FROM [db_name.]table_name;
+ SHOW INDEX[ES] FROM [db_name.]table_name [FROM database];
+ 或者
+ SHOW KEY[S] FROM [db_name.]table_name [FROM database];
</pre></div>
</div>
</div>
diff --git a/content/documentation/cn/sql-reference/sql-statements/Data Definition/ALTER DATABASE.html b/content/documentation/cn/sql-reference/sql-statements/Data Definition/ALTER DATABASE.html
index 4348df4..ae39609 100644
--- a/content/documentation/cn/sql-reference/sql-statements/Data Definition/ALTER DATABASE.html
+++ b/content/documentation/cn/sql-reference/sql-statements/Data Definition/ALTER DATABASE.html
@@ -213,8 +213,12 @@ under the License.
2) 重命名数据库
ALTER DATABASE db_name RENAME new_db_name;
+ 3) 设置数据库的副本数量配额
+ ALTER DATABASE db_name SET REPLICA QUOTA quota;
+
说明：
- 重命名数据库后，如需要，请使用 REVOKE 和 GRANT 命令修改相应的用户权限。
+ 重命名数据库后，如需要，请使用 REVOKE 和 GRANT 命令修改相应的用户权限。
+ 数据库的默认数据量配额为1024GB，默认副本数量配额为1073741824。
</pre></div>
</div>
</div>
@@ -231,6 +235,9 @@ under the License.
<span class="mf">2.</span> <span class="n">将数据库</span> <span class="n">example_db</span> <span class="n">重命名为</span> <span class="n">example_db2</span>
<span class="n">ALTER</span> <span class="n">DATABASE</span> <span class="n">example_db</span> <span class="n">RENAME</span> <span class="n">example_db2</span><span class="p">;</span>
+
+<span class="mf">3.</span> <span class="n">设定指定数据库副本数量配额</span>
+ <span class="n">ALTER</span> <span class="n">DATABASE</span> <span class="n">example_db</span> <span class="n">SET</span> <span class="n">REPLICA</span> <span class="n">QUOTA</span> <span class="mi">102400</span><span class="p">;</span>
</pre></div>
</div>
</div>
diff --git a/content/documentation/cn/sql-reference/sql-statements/Data Manipulation/ROUTINE LOAD.html b/content/documentation/cn/sql-reference/sql-statements/Data Manipulation/ROUTINE LOAD.html
index 873590e..a51eb64 100644
--- a/content/documentation/cn/sql-reference/sql-statements/Data Manipulation/ROUTINE LOAD.html
+++ b/content/documentation/cn/sql-reference/sql-statements/Data Manipulation/ROUTINE LOAD.html
@@ -422,9 +422,10 @@ FROM data_source
</div>
<div class="section" id="example">
<h2>example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>1. 为 example_db 的 example_tbl 创建一个名为 test1 的 Kafka 例行导入任务。指定group.id和client.id，并且自动默认消费所有分区，且从末尾（OFFSET_END）开始订阅
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>1. 为 example_db 的 example_tbl 创建一个名为 test1 的 Kafka 例行导入任务。指定列分隔符和 group.id 和 client.id，并且自动默认消费所有分区，且从有数据的位置（OFFSET_BEGINNING）开始订阅
CREATE ROUTINE LOAD example_db.test1 ON example_tbl
+ COLUMNS TERMINATED BY ",",
COLUMNS(k1, k2, k3, v1, v2, v3 = k1 * 100)
PROPERTIES
(
@@ -439,7 +440,8 @@ FROM data_source
"kafka_broker_list" = "broker1:9092,broker2:9092,broker3:9092",
"kafka_topic" = "my_topic",
"property.group.id" = "xxx",
- "property.client.id" = "xxx"
+ "property.client.id" = "xxx",
+ "property.kafka_default_offsets" = "OFFSET_BEGINNING"
);
2. 为 example_db 的 example_tbl 创建一个名为 test1 的 Kafka 例行导入任务。导入任务为严格模式。
diff --git a/content/documentation/cn/sql-reference/sql-statements/Data Manipulation/SHOW DATA.html b/content/documentation/cn/sql-reference/sql-statements/Data Manipulation/SHOW DATA.html
index f7aeaf9..db0ebda 100644
--- a/content/documentation/cn/sql-reference/sql-statements/Data Manipulation/SHOW DATA.html
+++ b/content/documentation/cn/sql-reference/sql-statements/Data Manipulation/SHOW DATA.html
@@ -205,24 +205,24 @@ under the License.
<h1>SHOW DATA<a class="headerlink" href="#show-data" title="Permalink to this headline">¶</a></h1>
<div class="section" id="description">
<h2>description<a class="headerlink" href="#description" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>该语句用于展示数据量
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>该语句用于展示数据量和副本数量
语法：
SHOW DATA [FROM db_name[.table_name]];
说明：
- 1. 如果不指定 FROM 子句，使用展示当前 db 下细分到各个 table 的数据量
- 2. 如果指定 FROM 子句，则展示 table 下细分到各个 index 的数据量
+ 1. 如果不指定 FROM 子句，使用展示当前 db 下细分到各个 table 的数据量和副本数量
+ 2. 如果指定 FROM 子句，则展示 table 下细分到各个 index 的数据量和副本数量
3. 如果想查看各个 Partition 的大小，请参阅 help show partitions
</pre></div>
</div>
</div>
<div class="section" id="example">
<h2>example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="mf">1.</span> <span class="n">展示默认</span> <span class="n">db</span> <span class="n">的各个</span> <span class="n">table</span> <span class="n">的数据量及汇总数据量</span>
- <span class="n">SHOW</span> <span class="n">DATA</span><span class="p">;</span>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>1. 展示默认 db 的各个 table 的数据量，副本数量，汇总数据量和汇总副本数量。
+ SHOW DATA;
-<span class="mf">2.</span> <span class="n">展示指定</span> <span class="n">db</span> <span class="n">的下指定表的细分数据量</span>
- <span class="n">SHOW</span> <span class="n">DATA</span> <span class="n">FROM</span> <span class="n">example_db</span><span class="o">.</span><span class="n">table_name</span><span class="p">;</span>
+2. 展示指定 db 的下指定表的细分数据量和副本数量
+ SHOW DATA FROM example_db.table_name;
</pre></div>
</div>
</div>
diff --git a/content/documentation/cn/sql-reference/sql-statements/Data Types/BOOLEAN.html b/content/documentation/cn/sql-reference/sql-statements/Data Types/BOOLEAN.html
index 6ca39d3..759753a 100644
--- a/content/documentation/cn/sql-reference/sql-statements/Data Types/BOOLEAN.html
+++ b/content/documentation/cn/sql-reference/sql-statements/Data Types/BOOLEAN.html
@@ -205,7 +205,7 @@ under the License.
<h1>BOOLEAN<a class="headerlink" href="#boolean" title="Permalink to this headline">¶</a></h1>
<div class="section" id="description">
<h2>description<a class="headerlink" href="#description" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>BOOL, BOOLEN
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>BOOL, BOOLEAN
与TINYINT一样，0代表false，1代表true
</pre></div>
</div>
diff --git a/content/documentation/en/administrator-guide/alter-table/index.html b/content/documentation/en/administrator-guide/alter-table/index.html
index 37c0a06..3e17f9e 100644
--- a/content/documentation/en/administrator-guide/alter-table/index.html
+++ b/content/documentation/en/administrator-guide/alter-table/index.html
@@ -36,7 +36,7 @@
<link rel="index" title="Index" href="../../../../genindex.html" />
<link rel="search" title="Search" href="../../../../search.html" />
<link rel="next" title="Bitmap Index" href="alter-table-bitmap-index_EN.html" />
- <link rel="prev" title="Insert Into" href="../load-data/insert-into-manual_EN.html" />
+ <link rel="prev" title="Delete" href="../load-data/delete-manual_EN.html" />
</head>
<body class="wy-body-for-nav">
@@ -268,7 +268,7 @@ under the License.
<a href="alter-table-bitmap-index_EN.html" class="btn btn-neutral float-right" title="Bitmap Index" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
- <a href="../load-data/insert-into-manual_EN.html" class="btn btn-neutral float-left" title="Insert Into" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+ <a href="../load-data/delete-manual_EN.html" class="btn btn-neutral float-left" title="Delete" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>
diff --git a/content/documentation/en/administrator-guide/load-data/broker-load-manual_EN.html b/content/documentation/en/administrator-guide/load-data/broker-load-manual_EN.html
index 8b72695..b4eea77 100644
--- a/content/documentation/en/administrator-guide/load-data/broker-load-manual_EN.html
+++ b/content/documentation/en/administrator-guide/load-data/broker-load-manual_EN.html
@@ -97,6 +97,7 @@
<li class="toctree-l4"><a class="reference internal" href="stream-load-manual_EN.html">Stream load</a></li>
<li class="toctree-l4"><a class="reference internal" href="routine-load-manual_EN.html">Routine Load</a></li>
<li class="toctree-l4"><a class="reference internal" href="insert-into-manual_EN.html">Insert Into</a></li>
+<li class="toctree-l4"><a class="reference internal" href="delete-manual_EN.html">Delete</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">Schema Change</a></li>
diff --git a/content/documentation/en/administrator-guide/load-data/delete-manual_EN.html b/content/documentation/en/administrator-guide/load-data/delete-manual_EN.html
new file mode 100644
index 0000000..78f88c0
--- /dev/null
+++ b/content/documentation/en/administrator-guide/load-data/delete-manual_EN.html
@@ -0,0 +1,424 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Delete — Doris Documentations 0.11.0 documentation</title>
+
+
+
+
+
+
+
+
+ <script type="text/javascript" src="../../../../_static/js/modernizr.min.js"></script>
+
+
+ <script type="text/javascript" id="documentation_options" data-url_root="../../../../" src="../../../../_static/documentation_options.js"></script>
+ <script type="text/javascript" src="../../../../_static/jquery.js"></script>
+ <script type="text/javascript" src="../../../../_static/underscore.js"></script>
+ <script type="text/javascript" src="../../../../_static/doctools.js"></script>
+ <script type="text/javascript" src="../../../../_static/language_data.js"></script>
+
+ <script type="text/javascript" src="../../../../_static/js/theme.js"></script>
+
+
+
+
+ <link rel="stylesheet" href="../../../../_static/css/theme.css" type="text/css" />
+ <link rel="stylesheet" href="../../../../_static/pygments.css" type="text/css" />
+ <link rel="index" title="Index" href="../../../../genindex.html" />
+ <link rel="search" title="Search" href="../../../../search.html" />
+ <link rel="next" title="Schema Change" href="../alter-table/index.html" />
+ <link rel="prev" title="Insert Into" href="insert-into-manual_EN.html" />
+</head>
+
+<body class="wy-body-for-nav">
+
+
+ <div class="wy-grid-for-nav">
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-scroll">
+ <div class="wy-side-nav-search" >
+
+
+
+ <a href="../../../../index.html" class="icon icon-home"> Doris Documentations
+
+
+
+ </a>
+
+
+
+
+ <div class="version">
+ 0.11.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+
+
+
+ <ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../../../cn/index.html">中文</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="../../index.html">English</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="../../downloads/index.html">Downloads</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../installing/index.html">Compilation and Deployment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../getting-started/index.html">Getting Started</a></li>
+<li class="toctree-l2 current"><a class="reference internal" href="../index.html">Administrator Guide</a><ul class="current">
+<li class="toctree-l3 current"><a class="reference internal" href="index.html">Load Data</a><ul class="current">
+<li class="toctree-l4"><a class="reference internal" href="load-manual_EN.html">Introduction Overview</a></li>
+<li class="toctree-l4"><a class="reference internal" href="broker-load-manual_EN.html">Broker Load</a></li>
+<li class="toctree-l4"><a class="reference internal" href="stream-load-manual_EN.html">Stream load</a></li>
+<li class="toctree-l4"><a class="reference internal" href="routine-load-manual_EN.html">Routine Load</a></li>
+<li class="toctree-l4"><a class="reference internal" href="insert-into-manual_EN.html">Insert Into</a></li>
+<li class="toctree-l4 current"><a class="current reference internal" href="#">Delete</a></li>
+</ul>
+</li>
+<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">Schema Change</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../http-actions/index.html">HTTP API</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../operation/index.html">Maintainence Operation</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../config/index.html">Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../backup-restore_EN.html">Backup and Recovery</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../broker_EN.html">Broker</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../colocation-join_EN.html">Colocation Join</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../dynamic-partition_EN.html">Dynamic Partition</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../export_manual_EN.html">Data export</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../privilege_EN.html">Authority Management</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../small-file-mgr_EN.html">File Manager</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../sql-mode_EN.html">SQL MODE</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../time-zone_EN.html">Time zone</a></li>
+<li class="toctree-l3"><a class="reference internal" href="../variables_EN.html">Variable</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="../../extending-doris/index.html">Extending Ability</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../internal/index.html">Design Documents</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../sql-reference/index.html">SQL Manual</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../developer-guide/index.html">Developer Guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../community/index.html">Apache Commnity</a></li>
+</ul>
+</li>
+</ul>
+
+
+
+ </div>
+ </div>
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" aria-label="top navigation">
+
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../../../../index.html">Doris Documentations</a>
+
+ </nav>
+
+
+ <div class="wy-nav-content">
+
+ <div class="rst-content">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<div role="navigation" aria-label="breadcrumbs navigation">
+
+ <ul class="wy-breadcrumbs">
+
+ <li><a href="../../../../index.html">Docs</a> »</li>
+
+ <li><a href="../../index.html">English</a> »</li>
+
+ <li><a href="../index.html">Administrator Guide</a> »</li>
+
+ <li><a href="index.html">Load Data</a> »</li>
+
+ <li>Delete</li>
+
+
+ <li class="wy-breadcrumbs-aside">
+
+
+
+ <a href="https://github.com/apache/incubator-doris/blob/master/docs/documentation/en/administrator-guide/load-data/delete-manual_EN.md" class="fa fa-github"> Edit on GitHub</a>
+
+
+
+ </li>
+
+ </ul>
+
+
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <!--
+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.
+--><div class="section" id="delete">
+<h1>Delete<a class="headerlink" href="#delete" title="Permalink to this headline">¶</a></h1>
+<p>Unlike other import methods, delete is a synchronization process. Similar to insert into, all delete operations are an independent import job in Doris. Generally, delete statements need to specify tables, partitions and delete conditions to tell which data to be deleted, and the data on base index and rollup index will be deleted at the same time.</p>
+<div class="section" id="syntax">
+<h2>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">¶</a></h2>
+<p>The delete statement’s syntax is as follows：</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">DELETE</span> <span class="n">FROM</span> <span class="n">table_name</span> <span class="p">[</span><span class="n">PARTITION</span> <span class="n">partition_name</span><span class="p">]</span>
+<span class="n">WHERE</span>
+<span class="n">column_name1</span> <span class="n">op</span> <span class="n">value</span><span class="p">[</span> <span class="n">AND</span> <span class="n">column_name2</span> <span class="n">op</span> <span class="n">value</span> <span class="o">...</span><span class="p">];</span>
+</pre></div>
+</div>
+<p>example 1：</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">DELETE</span> <span class="n">FROM</span> <span class="n">my_table</span> <span class="n">PARTITION</span> <span class="n">p1</span> <span class="n">WHERE</span> <span class="n">k1</span> <span class="o">=</span> <span class="mi">3</span><span class="p">;</span>
+</pre></div>
+</div>
+<p>example 2:</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">DELETE</span> <span class="n">FROM</span> <span class="n">my_table</span> <span class="n">PARTITION</span> <span class="n">p1</span> <span class="n">WHERE</span> <span class="n">k1</span> <span class="o"><</span> <span class="mi">3</span> <span class="n">AND</span> <span class="n">k2</span> <span class="o">=</span> <span class="s2">"abc"</span><span class="p">;</span>
+</pre></div>
+</div>
+<p>The following describes the parameters used in the delete statement:</p>
+<ul>
+<li><p class="first">PARTITION</p>
+<p>The target partition of the delete statement. If not specified, the table must be a single partition table, otherwise it cannot be deleted</p>
+</li>
+<li><p class="first">WHERE</p>
+<p>The conditiona of the delete statement. All delete statements must specify a where condition.</p>
+</li>
+</ul>
+<p>说明：</p>
+<ol class="simple">
+<li>The type of <code class="docutils literal notranslate"><span class="pre">OP</span></code> in the WHERE condition can only include <code class="docutils literal notranslate"><span class="pre">=,</span> <span class="pre">>,</span> <span class="pre"><,</span> <span class="pre">></span> <span class="pre">=,</span> <span class="pre"><</span> <span class="pre">=,!=</span></code>. Currently, where key in (value1, Value2, value3) mode is not supported yet, may be added this suppo [...]
+<li>The column in the WHERE condition can only be the <code class="docutils literal notranslate"><span class="pre">key</span></code> column.</li>
+<li>Cannot delete when the <code class="docutils literal notranslate"><span class="pre">key</span></code> column does not exist in any rollup table.</li>
+<li>Each condition in WHERE condition can only be realated by <code class="docutils literal notranslate"><span class="pre">and</span></code>. If you want <code class="docutils literal notranslate"><span class="pre">or</span></code>, you are suggested to write these conditions into two delete statements.</li>
+<li>If the specified table is a range partitioned table, <code class="docutils literal notranslate"><span class="pre">PARTITION</span></code> must be specified unless the table is a single partition table,.</li>
+<li>Unlike the insert into command, delete statement cannot specify <code class="docutils literal notranslate"><span class="pre">label</span></code> manually. You can view the concept of <code class="docutils literal notranslate"><span class="pre">label</span></code> in [Insert Into] (./insert-into-manual.md)</li>
+</ol>
+</div>
+<div class="section" id="delete-result">
+<h2>Delete Result<a class="headerlink" href="#delete-result" title="Permalink to this headline">¶</a></h2>
+<p>The delete command is an SQL command, and the returned results are synchronous. It can be divided into the following types:</p>
+<ol>
+<li><p class="first">Successful visible</p>
+<p>If delete completes successfully and is visible, the following results will be returned, <code class="docutils literal notranslate"><span class="pre">query</span> <span class="pre">OK</span></code> indicates success.</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">mysql</span><span class="o">></span> <span class="n">delete</span> <span class="kn">from</span> <span class="nn">test_tbl</span> <span class="n">PARTITION</span> <span class="n">p1</span> <span class="n">where</span> <span class="n">k1</span> <span class="o">=</span> <span class="mi">1</span><span class="p">;</span>
+<span class="n">Query</span> <span class="n">OK</span><span class="p">,</span> <span class="mi">0</span> <span class="n">rows</span> <span class="n">affected</span> <span class="p">(</span><span class="mf">0.04</span> <span class="n">sec</span><span class="p">)</span>
+<span class="p">{</span><span class="s1">'label'</span><span class="p">:</span><span class="s1">'delete_e7830c72-eb14-4cb9-bbb6-eebd4511d251'</span><span class="p">,</span> <span class="s1">'status'</span><span class="p">:</span><span class="s1">'VISIBLE'</span><span class="p">,</span> <span class="s1">'txnId'</span><span class="p">:</span><span class="s1">'4005'</span><span class="p">}</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first">Submitted successfully, but not visible</p>
+<p>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 [...]
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">mysql</span><span class="o">></span> <span class="n">delete</span> <span class="kn">from</span> <span class="nn">test_tbl</span> <span class="n">PARTITION</span> <span class="n">p1</span> <span class="n">where</span> <span class="n">k1</span> <span class="o">=</span> <span class="mi">1</span><span class="p">;</span>
+<span class="n">Query</span> <span class="n">OK</span><span class="p">,</span> <span class="mi">0</span> <span class="n">rows</span> <span class="n">affected</span> <span class="p">(</span><span class="mf">0.04</span> <span class="n">sec</span><span class="p">)</span>
+<span class="p">{</span><span class="s1">'label'</span><span class="p">:</span><span class="s1">'delete_e7830c72-eb14-4cb9-bbb6-eebd4511d251'</span><span class="p">,</span> <span class="s1">'status'</span><span class="p">:</span><span class="s1">'VISIBLE'</span><span class="p">,</span> <span class="s1">'txnId'</span><span class="p">:</span><span class="s1">'4005'</span><span class="p">,</span> <span class="s1">'err'</span><span clas [...]
+</pre></div>
+</div>
+<p>The result will return a JSON string at the same time:</p>
+<p><code class="docutils literal notranslate"><span class="pre">affected</span> <span class="pre">rows</span></code>: Indicates the row affected by this deletion. Since the deletion of Doris is currently a logical deletion, the value is always 0.</p>
+<p><code class="docutils literal notranslate"><span class="pre">label</span></code>: The label generated automatically to be the signature of the delete jobs. Each job has a unique label within a single database.</p>
+<p><code class="docutils literal notranslate"><span class="pre">status</span></code>: Indicates whether the data deletion is visible. If it is visible, <code class="docutils literal notranslate"><span class="pre">visible</span></code> will be displayed. If it is not visible, <code class="docutils literal notranslate"><span class="pre">committed</span></code> will be displayed.</p>
+<p><code class="docutils literal notranslate"><span class="pre">txnId</span></code>: The transaction ID corresponding to the delete job</p>
+<p><code class="docutils literal notranslate"><span class="pre">err</span></code>: Field will display some details of this deletion</p>
+</li>
+<li><p class="first">Commit failed, transaction cancelled</p>
+<p>If the delete statement is not submitted successfully, it will be automatically aborted by Doris and the following results will be returned</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">mysql</span><span class="o">></span> <span class="n">delete</span> <span class="kn">from</span> <span class="nn">test_tbl</span> <span class="n">partition</span> <span class="n">p1</span> <span class="n">where</span> <span class="n">k1</span> <span class="o">></span> <span class="mi">80</span><span class="p">;</span>
+<span class="n">ERROR</span> <span class="mi">1064</span> <span class="p">(</span><span class="n">HY000</span><span class="p">):</span> <span class="n">errCode</span> <span class="o">=</span> <span class="mi">2</span><span class="p">,</span> <span class="n">detailMessage</span> <span class="o">=</span> <span class="p">{</span><span class="n">错误原因</span><span class="p">}</span>
+</pre></div>
+</div>
+<p>example：</p>
+<p>A timeout deletion will return the timeout and unfinished replicas displayed as <code class="docutils literal notranslate"> <span class="pre">(tablet</span> <span class="pre">=</span> <span class="pre">replica)</span></code></p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">mysql</span><span class="o">></span> <span class="n">delete</span> <span class="kn">from</span> <span class="nn">test_tbl</span> <span class="n">partition</span> <span class="n">p1</span> <span class="n">where</span> <span class="n">k1</span> <span class="o">></span> <span class="mi">80</span><span class="p">;</span>
+<span class="n">ERROR</span> <span class="mi">1064</span> <span class="p">(</span><span class="n">HY000</span><span class="p">):</span> <span class="n">errCode</span> <span class="o">=</span> <span class="mi">2</span><span class="p">,</span> <span class="n">detailMessage</span> <span class="o">=</span> <span class="n">failed</span> <span class="n">to</span> <span class="n">delete</span> <span class="n">replicas</span> <span class="kn">from</span> <span class="nn">job</span><span class="p [...]
+</pre></div>
+</div>
+<p><strong>The correct processing logic for the returned results of the delete operation is as follows:</strong></p>
+<ol class="simple">
+<li>If <code class="docutils literal notranslate"><span class="pre">Error</span> <span class="pre">1064</span> <span class="pre">(HY000)</span></code> is returned, deletion fails</li>
+<li>If the returned result is <code class="docutils literal notranslate"><span class="pre">Query</span> <span class="pre">OK</span></code>, the deletion is successful<ol>
+<li>If <code class="docutils literal notranslate"><span class="pre">status</span></code> is <code class="docutils literal notranslate"><span class="pre">committed</span></code>, the data deletion is committed and will be eventually invisible. Users can wait for a while and then use the <code class="docutils literal notranslate"><span class="pre">show</span> <span class="pre">delete</span></code> command to view the results.</li>
+<li>If <code class="docutils literal notranslate"><span class="pre">status</span></code> is <code class="docutils literal notranslate"><span class="pre">visible</span></code>, the data have been deleted successfully.</li>
+</ol>
+</li>
+</ol>
+</li>
+</ol>
+</div>
+<div class="section" id="relevant-configuration">
+<h2>Relevant Configuration<a class="headerlink" href="#relevant-configuration" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="fe-configuration">
+<h3>FE configuration<a class="headerlink" href="#fe-configuration" title="Permalink to this headline">¶</a></h3>
+<p><strong>TIMEOUT configuration</strong></p>
+<p>In general, Doris’s deletion timeout is limited from 30 seconds to 5 minutes. The specific time can be adjusted through the following configuration items</p>
+<ul>
+<li><p class="first">tablet_delete_timeout_second</p>
+<p>The timeout of delete itself can be elastically changed by the number of tablets in the specified partition. This configuration represents the average timeout contributed by a tablet. The default value is 2.</p>
+<p>Assuming that there are 5 tablets under the specified partition for this deletion, the timeout time available for the deletion is 10 seconds. Because the minimum timeout is 30 seconds which is higher than former timeout time, the final timeout is 30 seconds.</p>
+</li>
+<li><p class="first">load_straggler_wait_second</p>
+<p>If the user estimates a large amount of data, so that the upper limit of 5 minutes is insufficient, the user can adjust the upper limit of timeout through this item, and the default value is 300.</p>
+<p><strong>The specific calculation rule of timeout(seconds)</strong></p>
+<p><code class="docutils literal notranslate"><span class="pre">TIMEOUT</span> <span class="pre">=</span> <span class="pre">MIN(load_straggler_wait_second,</span> <span class="pre">MAX(30,</span> <span class="pre">tablet_delete_timeout_second</span> <span class="pre">*</span> <span class="pre">tablet_num))</span></code></p>
+</li>
+<li><p class="first">query_timeout</p>
+<p>Because delete itself is an SQL command, the deletion statement is also limited by the session variables, and the timeout is also affected by the session value <code class="docutils literal notranslate"><span class="pre">query'timeout</span></code>. You can increase the value by <code class="docutils literal notranslate"><span class="pre">set</span> <span class="pre">query'timeout</span> <span class="pre">=</span> <span class="pre">xxx</span></code>.</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="section" id="show-delete-history">
+<h2>Show delete history<a class="headerlink" href="#show-delete-history" title="Permalink to this headline">¶</a></h2>
+<ol>
+<li><p class="first">The user can view the deletion completed in history through the show delete statement.</p>
+<p>Syntax</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">SHOW</span> <span class="n">DELETE</span> <span class="p">[</span><span class="n">FROM</span> <span class="n">db_name</span><span class="p">]</span>
+</pre></div>
+</div>
+<p>example</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">mysql</span><span class="o">></span> <span class="n">show</span> <span class="n">delete</span> <span class="kn">from</span> <span class="nn">test_db</span><span class="p">;</span>
+<span class="o">+-----------+---------------+---------------------+-----------------+----------+</span>
+<span class="o">|</span> <span class="n">TableName</span> <span class="o">|</span> <span class="n">PartitionName</span> <span class="o">|</span> <span class="n">CreateTime</span> <span class="o">|</span> <span class="n">DeleteCondition</span> <span class="o">|</span> <span class="n">State</span> <span class="o">|</span>
+<span class="o">+-----------+---------------+---------------------+-----------------+----------+</span>
+<span class="o">|</span> <span class="n">empty_tbl</span> <span class="o">|</span> <span class="n">p3</span> <span class="o">|</span> <span class="mi">2020</span><span class="o">-</span><span class="mi">04</span><span class="o">-</span><span class="mi">15</span> <span class="mi">23</span><span class="p">:</span><span class="mi">09</span><span class="p">:</span><span class="mi">35</span> <span class="o">|</span> <span class="n">k1</span> <span class="n">EQ</span> <span class="s [...]
+<span class="o">|</span> <span class="n">test_tbl</span> <span class="o">|</span> <span class="n">p4</span> <span class="o">|</span> <span class="mi">2020</span><span class="o">-</span><span class="mi">04</span><span class="o">-</span><span class="mi">15</span> <span class="mi">23</span><span class="p">:</span><span class="mi">09</span><span class="p">:</span><span class="mi">53</span> <span class="o">|</span> <span class="n">k1</span> <span class="n">GT</span> <span class="s [...]
+<span class="o">+-----------+---------------+---------------------+-----------------+----------+</span>
+<span class="mi">2</span> <span class="n">rows</span> <span class="ow">in</span> <span class="nb">set</span> <span class="p">(</span><span class="mf">0.00</span> <span class="n">sec</span><span class="p">)</span>
+</pre></div>
+</div>
+</li>
+</ol>
+</div>
+</div>
+
+
+ </div>
+
+ </div>
+ <!--
+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.
+-->
+
+<footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="../alter-table/index.html" class="btn btn-neutral float-right" title="Schema Change" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="insert-into-manual_EN.html" class="btn btn-neutral float-left" title="Insert Into" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2019, Apache Doris(Incubating)
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/rtfd/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+<div role="contentinfo">
+ <p></p>
+ <p>
+
+ Apache Doris(incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicat [...]
+
+ </p>
+</div>
+
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.Navigation.enable(true);
+ });
+ </script>
+
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/content/documentation/en/administrator-guide/load-data/index.html b/content/documentation/en/administrator-guide/load-data/index.html
index f051304..86dca2e 100644
--- a/content/documentation/en/administrator-guide/load-data/index.html
+++ b/content/documentation/en/administrator-guide/load-data/index.html
@@ -97,6 +97,7 @@
<li class="toctree-l4"><a class="reference internal" href="stream-load-manual_EN.html">Stream load</a></li>
<li class="toctree-l4"><a class="reference internal" href="routine-load-manual_EN.html">Routine Load</a></li>
<li class="toctree-l4"><a class="reference internal" href="insert-into-manual_EN.html">Insert Into</a></li>
+<li class="toctree-l4"><a class="reference internal" href="delete-manual_EN.html">Delete</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">Schema Change</a></li>
@@ -237,6 +238,13 @@
<li class="toctree-l2"><a class="reference internal" href="insert-into-manual_EN.html#common-questions">Common Questions</a></li>
</ul>
</li>
+<li class="toctree-l1"><a class="reference internal" href="delete-manual_EN.html">Delete</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="delete-manual_EN.html#syntax">Syntax</a></li>
+<li class="toctree-l2"><a class="reference internal" href="delete-manual_EN.html#delete-result">Delete Result</a></li>
+<li class="toctree-l2"><a class="reference internal" href="delete-manual_EN.html#relevant-configuration">Relevant Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="delete-manual_EN.html#show-delete-history">Show delete history</a></li>
+</ul>
+</li>
</ul>
</div>
</div>
diff --git a/content/documentation/en/administrator-guide/load-data/insert-into-manual_EN.html b/content/documentation/en/administrator-guide/load-data/insert-into-manual_EN.html
index f2bef29..72435c1 100644
--- a/content/documentation/en/administrator-guide/load-data/insert-into-manual_EN.html
+++ b/content/documentation/en/administrator-guide/load-data/insert-into-manual_EN.html
@@ -35,7 +35,7 @@
<link rel="stylesheet" href="../../../../_static/pygments.css" type="text/css" />
<link rel="index" title="Index" href="../../../../genindex.html" />
<link rel="search" title="Search" href="../../../../search.html" />
- <link rel="next" title="Schema Change" href="../alter-table/index.html" />
+ <link rel="next" title="Delete" href="delete-manual_EN.html" />
<link rel="prev" title="Routine Load" href="routine-load-manual_EN.html" />
</head>
@@ -97,6 +97,7 @@
<li class="toctree-l4"><a class="reference internal" href="stream-load-manual_EN.html">Stream load</a></li>
<li class="toctree-l4"><a class="reference internal" href="routine-load-manual_EN.html">Routine Load</a></li>
<li class="toctree-l4 current"><a class="current reference internal" href="#">Insert Into</a></li>
+<li class="toctree-l4"><a class="reference internal" href="delete-manual_EN.html">Delete</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">Schema Change</a></li>
@@ -463,7 +464,7 @@ under the License.
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="../alter-table/index.html" class="btn btn-neutral float-right" title="Schema Change" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="delete-manual_EN.html" class="btn btn-neutral float-right" title="Delete" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="routine-load-manual_EN.html" class="btn btn-neutral float-left" title="Routine Load" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
diff --git a/content/documentation/en/administrator-guide/load-data/load-manual_EN.html b/content/documentation/en/administrator-guide/load-data/load-manual_EN.html
index a8eeff0..8a91f69 100644
--- a/content/documentation/en/administrator-guide/load-data/load-manual_EN.html
+++ b/content/documentation/en/administrator-guide/load-data/load-manual_EN.html
@@ -97,6 +97,7 @@
<li class="toctree-l4"><a class="reference internal" href="stream-load-manual_EN.html">Stream load</a></li>
<li class="toctree-l4"><a class="reference internal" href="routine-load-manual_EN.html">Routine Load</a></li>
<li class="toctree-l4"><a class="reference internal" href="insert-into-manual_EN.html">Insert Into</a></li>
+<li class="toctree-l4"><a class="reference internal" href="delete-manual_EN.html">Delete</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">Schema Change</a></li>
diff --git a/content/documentation/en/administrator-guide/load-data/routine-load-manual_EN.html b/content/documentation/en/administrator-guide/load-data/routine-load-manual_EN.html
index 58a082e..e85c52d 100644
--- a/content/documentation/en/administrator-guide/load-data/routine-load-manual_EN.html
+++ b/content/documentation/en/administrator-guide/load-data/routine-load-manual_EN.html
@@ -97,6 +97,7 @@
<li class="toctree-l4"><a class="reference internal" href="stream-load-manual_EN.html">Stream load</a></li>
<li class="toctree-l4 current"><a class="current reference internal" href="#">Routine Load</a></li>
<li class="toctree-l4"><a class="reference internal" href="insert-into-manual_EN.html">Insert Into</a></li>
+<li class="toctree-l4"><a class="reference internal" href="delete-manual_EN.html">Delete</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">Schema Change</a></li>
diff --git a/content/documentation/en/administrator-guide/load-data/stream-load-manual_EN.html b/content/documentation/en/administrator-guide/load-data/stream-load-manual_EN.html
index 9099c67..0491f1b 100644
--- a/content/documentation/en/administrator-guide/load-data/stream-load-manual_EN.html
+++ b/content/documentation/en/administrator-guide/load-data/stream-load-manual_EN.html
@@ -97,6 +97,7 @@
<li class="toctree-l4 current"><a class="current reference internal" href="#">Stream load</a></li>
<li class="toctree-l4"><a class="reference internal" href="routine-load-manual_EN.html">Routine Load</a></li>
<li class="toctree-l4"><a class="reference internal" href="insert-into-manual_EN.html">Insert Into</a></li>
+<li class="toctree-l4"><a class="reference internal" href="delete-manual_EN.html">Delete</a></li>
</ul>
</li>
<li class="toctree-l3"><a class="reference internal" href="../alter-table/index.html">Schema Change</a></li>
diff --git a/content/documentation/en/getting-started/data-partition_EN.html b/content/documentation/en/getting-started/data-partition_EN.html
index f64d31d..c51eed2 100644
--- a/content/documentation/en/getting-started/data-partition_EN.html
+++ b/content/documentation/en/getting-started/data-partition_EN.html
@@ -418,7 +418,7 @@ PROPERTIES
<li>storage_medium & storage_cooldown_time<ul>
<li>The BE data storage directory can be explicitly specified as SSD or HDD (differentiated by .SSD or .HDD suffix). When you build a table, you can uniformly specify the media for all Partition initial storage. Note that the suffix is to explicitly specify the disk media without checking to see if it matches the actual media type.</li>
<li>The default initial storage media can be specified by <code class="docutils literal notranslate"><span class="pre">default_storage_medium=</span> <span class="pre">XXX</span></code> in the fe configuration file <code class="docutils literal notranslate"><span class="pre">fe.conf</span></code>, or, if not, by default, HDD. If specified as an SSD, the data is initially stored on the SSD.</li>
-<li>If storage_cooldown_time is not specified, the data is automatically migrated from the SSD to the HDD after 7 days by default. If storage_cooldown_time is specified, the data will not migrate until the storage_cooldown_time time is reached.</li>
+<li>If storage_cooldown_time is not specified, the data is automatically migrated from the SSD to the HDD after 30 days by default. If storage_cooldown_time is specified, the data will not migrate until the storage_cooldown_time time is reached.</li>
<li>Note that this parameter is just a “best effort” setting when storage_medium is specified. Even if no SSD storage media is set in the cluster, no error is reported and it is automatically stored in the available data directory. Similarly, if the SSD media is inaccessible and out of space, the data may initially be stored directly on other available media. When the data expires and is migrated to the HDD, if the HDD media is inaccessible and there is not enough space, the migration ma [...]
</ul>
</li>
diff --git a/content/documentation/en/sql-reference/sql-statements/Administration/SHOW INDEX_EN.html b/content/documentation/en/sql-reference/sql-statements/Administration/SHOW INDEX_EN.html
index 707b24f..b3b6084 100644
--- a/content/documentation/en/sql-reference/sql-statements/Administration/SHOW INDEX_EN.html
+++ b/content/documentation/en/sql-reference/sql-statements/Administration/SHOW INDEX_EN.html
@@ -205,9 +205,13 @@ under the License.
<h1>SHOW INDEX<a class="headerlink" href="#show-index" title="Permalink to this headline">¶</a></h1>
<div class="section" id="description">
<h2>description<a class="headerlink" href="#description" title="Permalink to this headline">¶</a></h2>
-<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>This statement is used to show all index(only bitmap index in current version) of a table
-语法：
- SHOW INDEX[ES] FROM [db_name.]table_name;
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">This</span> <span class="n">statement</span> <span class="ow">is</span> <span class="n">used</span> <span class="n">to</span> <span class="n">show</span> <span class="nb">all</span> <span class="n">index</span><span class="p">(</span><span class="n">only</span> <span class="n">bitmap</span> <span class="n">index</span> <span class="ow">in</span> <span class="n">current</span> <span class=" [...]
+<span class="n">Grammar</span><span class="p">:</span>
+ <span class="n">SHOW</span> <span class="n">INDEX</span><span class="p">[</span><span class="n">ES</span><span class="p">]</span> <span class="n">FROM</span> <span class="p">[</span><span class="n">db_name</span><span class="o">.</span><span class="p">]</span><span class="n">table_name</span> <span class="p">[</span><span class="n">FROM</span> <span class="n">database</span><span class="p">];</span>
+
+ <span class="n">OR</span>
+
+ <span class="n">SHOW</span> <span class="n">KEY</span><span class="p">[</span><span class="n">S</span><span class="p">]</span> <span class="n">FROM</span> <span class="p">[</span><span class="n">db_name</span><span class="o">.</span><span class="p">]</span><span class="n">table_name</span> <span class="p">[</span><span class="n">FROM</span> <span class="n">database</span><span class="p">];</span>
</pre></div>
</div>
</div>
diff --git a/content/documentation/en/sql-reference/sql-statements/Data Definition/ALTER DATABASE_EN.html b/content/documentation/en/sql-reference/sql-statements/Data Definition/ALTER DATABASE_EN.html
index 3589d64..2143e36 100644
--- a/content/documentation/en/sql-reference/sql-statements/Data Definition/ALTER DATABASE_EN.html
+++ b/content/documentation/en/sql-reference/sql-statements/Data Definition/ALTER DATABASE_EN.html
@@ -214,7 +214,8 @@ OTHER DATABASE dbu name SET DATA QUOTA quota;</li>
ALTER DATABASE db_name RENAME new_db_name;</li>
</ol>
<p>Explain:
-After renaming the database, use REVOKE and GRANT commands to modify the corresponding user rights if necessary.</p>
+After renaming the database, use REVOKE and GRANT commands to modify the corresponding user rights if necessary.
+The database’s default data quota is 1024GB, and the default replica quota is 1073741824.</p>
</div>
<div class="section" id="example">
<h2>example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
diff --git a/content/documentation/en/sql-reference/sql-statements/Data Definition/CREATE TABLE_EN.html b/content/documentation/en/sql-reference/sql-statements/Data Definition/CREATE TABLE_EN.html
index 8654503..82a36dc 100644
--- a/content/documentation/en/sql-reference/sql-statements/Data Definition/CREATE TABLE_EN.html
+++ b/content/documentation/en/sql-reference/sql-statements/Data Definition/CREATE TABLE_EN.html
@@ -390,7 +390,7 @@ The default buckets is 10.</li>
</div>
<p>storage_medium: SSD or HDD, The default initial storage media can be specified by <code class="docutils literal notranslate"><span class="pre">default_storage_medium=</span> <span class="pre">XXX</span></code> in the fe configuration file <code class="docutils literal notranslate"><span class="pre">fe.conf</span></code>, or, if not, by default, HDD.
storage_cooldown_time: If storage_medium is SSD, data will be automatically moved to HDD when timeout.
-Default is 7 days.
+Default is 30 days.
Format: “yyyy-MM-dd HH:mm:ss”
replication_num: Replication number of a partition. Default is 3.
If table is not range partitions. This property takes on Table level. Or it will takes on Partition level.
diff --git a/content/documentation/en/sql-reference/sql-statements/Data Manipulation/SHOW DATA_EN.html b/content/documentation/en/sql-reference/sql-statements/Data Manipulation/SHOW DATA_EN.html
index ce5b461..a2bb978 100644
--- a/content/documentation/en/sql-reference/sql-statements/Data Manipulation/SHOW DATA_EN.html
+++ b/content/documentation/en/sql-reference/sql-statements/Data Manipulation/SHOW DATA_EN.html
@@ -205,22 +205,22 @@ under the License.
<h1>SHOW DATA<a class="headerlink" href="#show-data" title="Permalink to this headline">¶</a></h1>
<div class="section" id="description">
<h2>Description<a class="headerlink" href="#description" title="Permalink to this headline">¶</a></h2>
-<p>This statement is used to show the amount of data
+<p>This statement is used to show the amount of data and the number of replica
Grammar:
SHOW DATA [FROM db_name[.table_name]];</p>
<p>Explain:</p>
<ol class="simple">
-<li>If you do not specify the FROM clause, use the amount of data that shows the current DB subdivided into tables</li>
-<li>If the FROM clause is specified, the amount of data subdivided into indices under the table is shown.</li>
+<li>If you do not specify the FROM clause, use the amount of data and the number of replica that shows the current DB subdivided into tables</li>
+<li>If the FROM clause is specified, the amount of data and the number of replica subdivided into indices under the table is shown.</li>
<li>If you want to see the size of individual Partitions, see help show partitions</li>
</ol>
</div>
<div class="section" id="example">
<h2>example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
<ol class="simple">
-<li>Display the data volume and aggregate data volume of each table of default DB
+<li>Display the data volume, replica size, aggregate data volume and aggregate replica count of each table of default DB
SHOW DATA;</li>
-<li>Display the subdivision data volume of the specified table below the specified DB
+<li>Display the subdivision data volume and replica count of the specified table below the specified DB
SHOW DATA FROM example_db.table_name;</li>
</ol>
</div>
diff --git a/content/documentation/en/sql-reference/sql-statements/Data Types/BOOLEAN_EN.html b/content/documentation/en/sql-reference/sql-statements/Data Types/BOOLEAN_EN.html
index b455d72..628b1a9 100644
--- a/content/documentation/en/sql-reference/sql-statements/Data Types/BOOLEAN_EN.html
+++ b/content/documentation/en/sql-reference/sql-statements/Data Types/BOOLEAN_EN.html
@@ -205,7 +205,7 @@ under the License.
<h1>BOOLEAN<a class="headerlink" href="#boolean" title="Permalink to this headline">¶</a></h1>
<div class="section" id="description">
<h2>Description<a class="headerlink" href="#description" title="Permalink to this headline">¶</a></h2>
-<p>BOOL, BOOLEN
+<p>BOOL, BOOLEAN
Like TINYINT, 0 stands for false and 1 for true.</p>
<p>##keyword
BOOLEAN</p>
diff --git a/content/nohup.out b/content/nohup.out
index d3fda25..1238f26 100644
Binary files a/content/nohup.out and b/content/nohup.out differ
diff --git a/content/objects.inv b/content/objects.inv
index f809ac5..c3314ff 100644
Binary files a/content/objects.inv and b/content/objects.inv differ
diff --git a/content/searchindex.js b/content/searchindex.js
index 403432e..e772ba0 100644
--- a/content/searchindex.js
+++ b/content/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["documentation/cn/administrator-guide/alter-table/alter-table-bitmap-index","documentation/cn/administrator-guide/alter-table/alter-table-rollup","documentation/cn/administrator-guide/alter-table/alter-table-schema-change","documentation/cn/administrator-guide/alter-table/alter-table-temp-partition","documentation/cn/administrator-guide/alter-table/index","documentation/cn/administrator-guide/backup-restore","documentation/cn/administrator-guide/broker","docume [...]
\ No newline at end of file
+Search.setIndex({docnames:["documentation/cn/administrator-guide/alter-table/alter-table-bitmap-index","documentation/cn/administrator-guide/alter-table/alter-table-rollup","documentation/cn/administrator-guide/alter-table/alter-table-schema-change","documentation/cn/administrator-guide/alter-table/alter-table-temp-partition","documentation/cn/administrator-guide/alter-table/index","documentation/cn/administrator-guide/backup-restore","documentation/cn/administrator-guide/broker","docume [...]
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org