This is an automated email from the ASF dual-hosted git repository.
kassiez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-website.git
The following commit(s) were added to refs/heads/master by this push:
new 1a7c0a1a3cf Doc optimize (#1739)
1a7c0a1a3cf is described below
commit 1a7c0a1a3cfc49c14177a6456cea888552594a16
Author: wangtianyi2004 <[email protected]>
AuthorDate: Thu Jan 9 14:51:13 2025 +0800
Doc optimize (#1739)
## Versions
- [x] dev
- [x] 3.0
- [x] 2.1
- [ ] 2.0
## Languages
- [x] Chinese
- [x] English
## Docs Checklist
- [ ] Checked by AI
- [ ] Test Cases Built
---
docs/admin-manual/data-admin/recyclebin.md | 6 +--
docs/data-operate/delete/delete-overview.md | 3 +-
docs/query-acceleration/sql-cache-manual.md | 4 +-
.../data-partitioning/auto-partitioning.md | 3 --
.../data-partitioning/manual-partitioning.md | 2 +-
docs/table-design/index/inverted-index.md | 1 +
docs/table-design/tiered-storage/remote-storage.md | 2 +-
.../docusaurus-plugin-content-docs/current.json | 2 +-
.../current/admin-manual/data-admin/recyclebin.md | 8 +---
.../current/data-operate/delete/delete-overview.md | 3 +-
.../data-operate/update/update-of-unique-model.md | 52 ++--------------------
.../data-partitioning/auto-partitioning.md | 9 ++--
.../data-partitioning/manual-partitioning.md | 2 +-
.../current/table-design/index/inverted-index.md | 1 +
.../version-2.1.json | 2 +-
.../admin-manual/data-admin/recyclebin.md | 8 +---
.../data-operate/delete/delete-overview.md | 3 +-
.../data-partitioning/auto-partitioning.md | 9 ++--
.../data-partitioning/manual-partitioning.md | 2 +-
.../table-design/index/inverted-index.md | 7 +--
.../version-3.0.json | 2 +-
.../admin-manual/data-admin/recyclebin.md | 8 +---
.../data-operate/delete/delete-overview.md | 3 +-
.../data-partitioning/auto-partitioning.md | 8 ++--
.../data-partitioning/manual-partitioning.md | 2 +-
.../table-design/index/inverted-index.md | 1 +
sidebars.json | 2 +-
.../admin-manual/data-admin/recyclebin.md | 6 +--
.../data-operate/delete/delete-overview.md | 3 +-
.../query-acceleration/sql-cache-manual.md | 2 +-
.../data-partitioning/auto-partitioning.md | 3 --
.../data-partitioning/manual-partitioning.md | 2 +-
.../table-design/index/inverted-index.md | 1 +
.../table-design/tiered-storage/remote-storage.md | 2 +-
.../admin-manual/data-admin/recyclebin.md | 6 +--
.../data-operate/delete/delete-overview.md | 3 +-
.../query-acceleration/sql-cache-manual.md | 2 +-
.../data-partitioning/auto-partitioning.md | 3 --
.../data-partitioning/manual-partitioning.md | 2 +-
.../table-design/index/inverted-index.md | 1 +
.../table-design/tiered-storage/remote-storage.md | 2 +-
versioned_sidebars/version-2.1-sidebars.json | 2 +-
versioned_sidebars/version-3.0-sidebars.json | 2 +-
43 files changed, 55 insertions(+), 142 deletions(-)
diff --git a/docs/admin-manual/data-admin/recyclebin.md
b/docs/admin-manual/data-admin/recyclebin.md
index 95bcab15e91..9eda0f825f6 100644
--- a/docs/admin-manual/data-admin/recyclebin.md
+++ b/docs/admin-manual/data-admin/recyclebin.md
@@ -24,13 +24,9 @@ specific language governing permissions and limitations
under the License.
-->
-## Data Lifecycle
-
-When a user executes the `DROP DATABASE/TABLE/PARTITION` command without
`FORCE`, Doris moves the deleted database, table, or partition to the recycle
bin. The `RECOVER` command can be used to restore all data of the deleted
database, table, or partition from the recycle bin, making them visible again.
-
## Recover from Recycle Bin
-In order to avoid disasters caused by misoperation, Doris supports data
recovery of accidentally deleted databases, tables, and partitions. After
dropping a table or database, Doris does not physically delete the data
immediately. Instead, it is moved to the trash for a certain period of time
(the default is 1 day, which can be configured through the
`catalog_trash_expire_second` parameter in `fe.conf`). The administrator can
use the `RECOVER` command to restore accidentally deleted data.
+To avoid disasters caused by accidental operations, Doris supports the
recovery of accidentally deleted databases, tables, and partitions. After
deleting a table or database, Doris does not immediately physically delete the
data. When the user executes the `DROP DATABASE/TABLE/PARTITION` command
without using `FORCE`, Doris moves the deleted database, table, or partition to
the recycle bin. The `RECOVER` command can be used to restore all data of the
deleted database, table, or partition [...]
**Note:** If the deletion was performed using `DROP FORCE`, the data will be
immediately deleted and cannot be recovered.
diff --git a/docs/data-operate/delete/delete-overview.md
b/docs/data-operate/delete/delete-overview.md
index 994f2274c7e..52e7d43c78d 100644
--- a/docs/data-operate/delete/delete-overview.md
+++ b/docs/data-operate/delete/delete-overview.md
@@ -72,6 +72,5 @@ In some cases, users may want to rewrite the data of a
partition. If the data is
## Notes
1. The delete operation generates new data versions, so frequent deletions may
increase the number of versions, affecting query performance.
-2. Compaction is a key step in freeing up storage space. Users are advised to
adjust the compaction strategy based on system load.
-3. Deleted data will still occupy storage until compaction is completed, so
the delete operation itself will not immediately reduce storage usage.
+2. Deleted data will still occupy storage until compaction is completed, so
the delete operation itself will not immediately reduce storage usage.
diff --git a/docs/query-acceleration/sql-cache-manual.md
b/docs/query-acceleration/sql-cache-manual.md
index 916e9f65211..c36dc8ff4a4 100644
--- a/docs/query-acceleration/sql-cache-manual.md
+++ b/docs/query-acceleration/sql-cache-manual.md
@@ -26,7 +26,7 @@ under the License.
## Description
-SQL Cache is a query optimization mechanism provided by Doris that can
significantly enhance query performance. It reduces redundant computations by
caching query results, making it suitable for scenarios where data update
frequency is low.
+SQL Cache is a query optimization mechanism provided by Doris that can
significantly enhance query performance. It reduces redundant computations by
caching query results, making it suitable for scenarios where data update
infrequently.
SQL Cache stores and retrieves caches based on the following key factors:
@@ -230,7 +230,7 @@ ADMIN SET FRONTEND CONFIG
('cache_result_max_row_count'='3000');
ADMIN SET FRONTEND CONFIG ('cache_result_max_data_size'='31457280');
```
-## Troubleshooting Cache Invalidation
+## Troubleshooting Cache Miss
The reasons for cache invalidation typically include the following:
diff --git a/docs/table-design/data-partitioning/auto-partitioning.md
b/docs/table-design/data-partitioning/auto-partitioning.md
index 84206017138..63f98bf54e9 100644
--- a/docs/table-design/data-partitioning/auto-partitioning.md
+++ b/docs/table-design/data-partitioning/auto-partitioning.md
@@ -303,6 +303,3 @@ For a detailed grammar description, see:
[auto_partition_name](../../sql-manual/
- When use
[insert-overwrite](../../sql-manual/sql-statements/Data-Manipulation-Statements/Manipulation/INSERT-OVERWRITE)
to load data into Auto Partition table, the behaviour is detailed in the
INSERT OVERWRITE documentation.
- If metadata operations are involved when importing and creating partitions,
the import process may fail.
-## Keywords
-
-AUTO, PARTITION, AUTO_PARTITION
diff --git a/docs/table-design/data-partitioning/manual-partitioning.md
b/docs/table-design/data-partitioning/manual-partitioning.md
index ce0f2345645..ee49b16f119 100644
--- a/docs/table-design/data-partitioning/manual-partitioning.md
+++ b/docs/table-design/data-partitioning/manual-partitioning.md
@@ -27,7 +27,7 @@ under the License.
## Partition columns
-- Partition columns can be specified as one or multiple columns, and the
partition columns must be KEY columns. The usage of multi-column partitioning
will be introduced later in the summary section of multi-column partitioning.
+- Partition columns can be specified as one or multiple columns, and the
partition columns must be KEY columns.
- When `allow_partition_column_nullable` is set to true, Range partition
supports the use of NULL partition columns. List Partition does not support
NULL partition columns at all times.
diff --git a/docs/table-design/index/inverted-index.md
b/docs/table-design/index/inverted-index.md
index c0213223f3e..b4298228c39 100644
--- a/docs/table-design/index/inverted-index.md
+++ b/docs/table-design/index/inverted-index.md
@@ -291,6 +291,7 @@ SELECT * FROM table_name WHERE content MATCH_ALL 'keyword1
keyword2';
-- 'keyword1 keyword2', 'wordx keyword1 keyword2', 'wordx keyword1 keyword2
wordy' all match because they contain 'keyword1 keyword2' with keyword2
immediately following keyword1
-- 'keyword1 wordx keyword2' does not match because there is a word between
keyword1 and keyword2
-- 'keyword2 keyword1' does not match because the order is reversed
+-- To use MATCH_PHRASE, you need to enable "support_phrase" = "true" in
PROPERTIES.
SELECT * FROM table_name WHERE content MATCH_PHRASE 'keyword1 keyword2';
-- 2.2 Rows in the content column containing both keyword1 and keyword2, with
a slop (maximum word distance) of 3
diff --git a/docs/table-design/tiered-storage/remote-storage.md
b/docs/table-design/tiered-storage/remote-storage.md
index a25ceef5429..b08aa1807ac 100644
--- a/docs/table-design/tiered-storage/remote-storage.md
+++ b/docs/table-design/tiered-storage/remote-storage.md
@@ -205,7 +205,7 @@ To optimize query performance and save object storage
resources, local Cache has
For specific configurations, please refer to (../../lakehouse/filecache).
-## Common Issues
+## FAQ
1. `ERROR 1105 (HY000): errCode = 2, detailMessage = Failed to create
repository: connect to s3 failed: Unable to marshall request to JSON: host must
not be null.`
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/current.json
b/i18n/zh-CN/docusaurus-plugin-content-docs/current.json
index 247090214fb..b22ef352426 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/current.json
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/current.json
@@ -183,7 +183,7 @@
"message": "物化视图",
"description": "The label for category View and Materialize View in
sidebar docs"
},
- "sidebar.docs.category.Async-Materialize View": {
+ "sidebar.docs.category.Async-Materialized View": {
"message": "异步物化视图",
"description": "The label for category View and Materialize View in
sidebar docs"
},
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/data-admin/recyclebin.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/data-admin/recyclebin.md
index 6ad0822c7ba..5bc1d3adf1b 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/data-admin/recyclebin.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/data-admin/recyclebin.md
@@ -24,13 +24,9 @@ specific language governing permissions and limitations
under the License.
-->
-## 数据生命周期
-
-当用户执行`DROP
DATABASE/TABLE/PARTITION`命令而不使用`FORCE`时，Doris会将删除的数据库、表或分区移动到回收站。可以使用`RECOVER`命令从回收站恢复已删除的数据库、表或分区的所有数据，使其再次可见。
-
## 从回收站恢复
-
-为了避免因误操作造成的灾难，Doris支持意外删除的数据库、表和分区的数据恢复。在删除表或数据库后，Doris不会立即物理删除数据。相反，它会在一定时间内将其移动到垃圾箱（默认是1天，可以通过`catalog_trash_expire_second`参数在`fe.conf`中进行配置）。管理员可以使用`RECOVER`命令恢复意外删除的数据。
+为了避免因误操作造成的灾难，Doris支持意外删除的数据库、表和分区的数据恢复。在删除表或数据库后，Doris不会立即物理删除数据。
+当用户执行`DROP
DATABASE/TABLE/PARTITION`命令而不使用`FORCE`时，Doris会将删除的数据库、表或分区移动到回收站。可以使用`RECOVER`命令从回收站恢复已删除的数据库、表或分区的所有数据，使其再次可见。
**注意：** 如果使用`DROP FORCE`执行删除，则数据将立即被删除，无法恢复。
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/delete/delete-overview.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/delete/delete-overview.md
index 395783dc90d..715c7abc865 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/delete/delete-overview.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/delete/delete-overview.md
@@ -71,6 +71,5 @@ TRUNCATE TABLE table_name;
## 注意事项
1. 删除操作会生成新的数据版本，因此频繁执行删除可能会导致版本数量增加，从而影响查询性能。
-2. 合并压缩是释放存储空间的关键步骤，建议用户根据系统负载调整压缩策略。
-3. 删除后的数据在合并压缩完成之前仍会占用存储，因此删除操作本身不会立即降低存储使用。
+2. 删除后的数据在合并压缩完成之前仍会占用存储，因此删除操作本身不会立即降低存储使用。
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/update/update-of-unique-model.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/update/update-of-unique-model.md
index 03eb3fc2d04..6a430d01533 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/update/update-of-unique-model.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/update/update-of-unique-model.md
@@ -51,17 +51,7 @@ under the License.
### 使用方式
-#### 建表
-
-建表时需要指定如下 property，以开启 Merge-on-Write 实现
-
-```sql
-enable_unique_key_merge_on_write = true
-```
-
-#### 导入
-
-**StreamLoad/BrokerLoad/RoutineLoad**
+**StreamLoad/BrokerLoad/RoutineLoad 导入**
如果使用的是 Stream Load/Broker Load/Routine Load，在导入时添加如下 header
@@ -75,7 +65,7 @@ partial_columns:true
curl --location-trusted -u root: -H "partial_columns:true" -H
"column_separator:," -H "columns:order_id,order_status" -T /tmp/update.csv
http://127.0.0.1:8030/api/db1/order_tbl/_stream_load
```
-**INSERT INTO**
+**INSERT INTO 导入**
在所有的数据模型中，`INSERT INTO` 给定一部分列时默认行为都是整行写入，为了防止误用，在 Merge-on-Write 实现中，`INSERT
INTO`默认仍然保持整行 UPSERT 的语义，如果需要开启部分列更新的语义，需要设置如下 session variable
@@ -86,7 +76,7 @@ INSERT INTO order_tbl (order_id, order_status) VALUES
(1,'待发货');
需要注意的是，控制 insert 语句是否开启严格模式的会话变量`enable_insert_strict`的默认值为 true，即 insert
语句默认开启严格模式，而在严格模式下进行部分列更新不允许更新不存在的 key。所以，在使用 insert 语句进行部分列更新的时候如果希望能插入不存在的
key，需要在`enable_unique_key_partial_update`设置为 true
的基础上同时将`enable_insert_strict`设置为 false。
-**Flink Connector**
+**Flink Connector 导入**
如果使用 Flink Connector, 需要添加如下配置：
@@ -96,42 +86,6 @@ INSERT INTO order_tbl (order_id, order_status) VALUES
(1,'待发货');
同时在`sink.properties.column`中指定要导入的列（必须包含所有 key 列，不然无法更新）
-### 示例
-
-假设 Doris 中存在一张订单表 order_tbl，其中订单 id 是 Key 列，订单状态，订单金额是 Value 列。数据状态如下：
-
-| 订单 id | 订单金额 | 订单状态 |
-| ------ | -------- | -------- |
-| 1 | 100 | 待付款 |
-
-```sql
-+----------+--------------+--------------+
-| order_id | order_amount | order_status |
-+----------+--------------+--------------+
-| 1 | 100 | 待付款 |
-+----------+--------------+--------------+
-1 row in set (0.01 sec)
-```
-
-这时候，用户点击付款后，Doris 系统需要将订单 id 为 '1' 的订单状态变更为 '待发货'。
-
-使用`INSERT INTO`进行更新：
-
-```sql
-SET enable_unique_key_partial_update=true;
-INSERT INTO order_tbl (order_id, order_status) VALUES (1,'待发货');
-```
-
-更新后结果如下
-
-```sql
-+----------+--------------+--------------+
-| order_id | order_amount | order_status |
-+----------+--------------+--------------+
-| 1 | 100 | 待发货 |
-+----------+--------------+--------------+
-1 row in set (0.01 sec)
-```
### 使用注意
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/table-design/data-partitioning/auto-partitioning.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/table-design/data-partitioning/auto-partitioning.md
index 2792a4c35c6..092f59216da 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/table-design/data-partitioning/auto-partitioning.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/table-design/data-partitioning/auto-partitioning.md
@@ -103,7 +103,7 @@ PROPERTIES (
```sql
CREATE TABLE `date_table` (
- `TIME_STAMP` datev2 NOT NULL COMMENT '采集日期'
+ `TIME_STAMP` datev2 NOT NULL
) ENGINE=OLAP
DUPLICATE KEY(`TIME_STAMP`)
AUTO PARTITION BY RANGE (date_trunc(`TIME_STAMP`, 'month'))
@@ -203,8 +203,8 @@ ERROR 1105 (HY000): errCode = 2, detailMessage = AUTO RANGE
PARTITION doesn't su
```sql
CREATE TABLE `DAILY_TRADE_VALUE`
(
- `TRADE_DATE` datev2 NOT NULL COMMENT '交易日期',
- `TRADE_ID` varchar(40) NOT NULL COMMENT '交易编号',
+ `TRADE_DATE` datev2 NOT NULL,
+ `TRADE_ID` varchar(40) NOT NULL,
......
)
UNIQUE KEY(`TRADE_DATE`, `TRADE_ID`)
@@ -303,6 +303,3 @@ mysql> select * from
partitions("catalog"="internal","database"="optest","table"
-
在使用[insert-overwrite](../../sql-manual/sql-statements/Data-Manipulation-Statements/Manipulation/INSERT-OVERWRITE)插入数据时
AUTO PARTITION 表的行为详见 INSERT OVERWRITE 文档。
- 如果导入创建分区时，该表涉及其他元数据操作（如 Schema Change、Rebalance），则导入可能失败。
-## 关键词
-
-AUTO, PARTITION, AUTO_PARTITION
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/table-design/data-partitioning/manual-partitioning.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/table-design/data-partitioning/manual-partitioning.md
index 8302f435549..bf3d0b024a4 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/table-design/data-partitioning/manual-partitioning.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/table-design/data-partitioning/manual-partitioning.md
@@ -27,7 +27,7 @@ under the License.
## 分区列
-- 分区列可以指定一列或多列，分区列必须为 KEY 列。多列分区的使用方式在后面多列分区小结介绍。
+- 分区列可以指定一列或多列，分区列必须为 KEY 列。
- PARTITION 列默认必须为 NOT NULL 列，如果需要使用 NULL 列，应设置 session variable
`allow_partition_column_nullable = true`。对于 LIST PARTITION，支持真正的 NULL 分区。对于
RANGE PARTITION，NULL 值会被划归**最小的 LESS THAN 分区**。
- 不论分区列是什么类型，在写分区值时，都需要加双引号。
- 分区数量理论上没有上限。但默认限制每张表 4096 个分区，如果想突破这个限制，可以修改 FE
配置`max_multi_partition_num`和`max_dynamic_partition_num `。
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/table-design/index/inverted-index.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/table-design/index/inverted-index.md
index 78b3da13ceb..2adc8bad10f 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/table-design/index/inverted-index.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/table-design/index/inverted-index.md
@@ -294,6 +294,7 @@ SELECT * FROM table_name WHERE content MATCH_ALL 'keyword1
keyword2';
-- 'keyword1 keyword2'，'wordx keyword1 keyword2'，'wordx keyword1 keyword2
wordy' 能匹配，因为他们都包含 keyword1 keyword2，而且 keyword2 紧跟在 keyword1 后面
-- 'keyword1 wordx keyword2' 不能匹配，因为 keyword1 keyword2 之间隔了一个词 wordx
-- 'keyword2 keyword1'，因为 keyword1 keyword2 的顺序反了
+-- 使用 MATCH_PHRASE 需要再 PROPERTIES 中开启 "support_phrase" = "true"
SELECT * FROM table_name WHERE content MATCH_PHRASE 'keyword1 keyword2';
-- 2.2 content 列中同时包含 keyword1 和 keyword2 的行，而且 keyword1 keyword2 的
`词距`（slop）不超过 3
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1.json
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1.json
index a90cf234e04..ed9c88a3930 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1.json
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1.json
@@ -167,7 +167,7 @@
"message": "物化视图",
"description": "The label for category View and Materialize View in
sidebar docs"
},
- "sidebar.docs.category.Async-Materialize View": {
+ "sidebar.docs.category.Async-Materialized View": {
"message": "异步物化视图",
"description": "The label for category View and Materialize View in
sidebar docs"
},
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/recyclebin.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/recyclebin.md
index 6ad0822c7ba..5bc1d3adf1b 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/recyclebin.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/recyclebin.md
@@ -24,13 +24,9 @@ specific language governing permissions and limitations
under the License.
-->
-## 数据生命周期
-
-当用户执行`DROP
DATABASE/TABLE/PARTITION`命令而不使用`FORCE`时，Doris会将删除的数据库、表或分区移动到回收站。可以使用`RECOVER`命令从回收站恢复已删除的数据库、表或分区的所有数据，使其再次可见。
-
## 从回收站恢复
-
-为了避免因误操作造成的灾难，Doris支持意外删除的数据库、表和分区的数据恢复。在删除表或数据库后，Doris不会立即物理删除数据。相反，它会在一定时间内将其移动到垃圾箱（默认是1天，可以通过`catalog_trash_expire_second`参数在`fe.conf`中进行配置）。管理员可以使用`RECOVER`命令恢复意外删除的数据。
+为了避免因误操作造成的灾难，Doris支持意外删除的数据库、表和分区的数据恢复。在删除表或数据库后，Doris不会立即物理删除数据。
+当用户执行`DROP
DATABASE/TABLE/PARTITION`命令而不使用`FORCE`时，Doris会将删除的数据库、表或分区移动到回收站。可以使用`RECOVER`命令从回收站恢复已删除的数据库、表或分区的所有数据，使其再次可见。
**注意：** 如果使用`DROP FORCE`执行删除，则数据将立即被删除，无法恢复。
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/data-operate/delete/delete-overview.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/data-operate/delete/delete-overview.md
index 395783dc90d..715c7abc865 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/data-operate/delete/delete-overview.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/data-operate/delete/delete-overview.md
@@ -71,6 +71,5 @@ TRUNCATE TABLE table_name;
## 注意事项
1. 删除操作会生成新的数据版本，因此频繁执行删除可能会导致版本数量增加，从而影响查询性能。
-2. 合并压缩是释放存储空间的关键步骤，建议用户根据系统负载调整压缩策略。
-3. 删除后的数据在合并压缩完成之前仍会占用存储，因此删除操作本身不会立即降低存储使用。
+2. 删除后的数据在合并压缩完成之前仍会占用存储，因此删除操作本身不会立即降低存储使用。
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/data-partitioning/auto-partitioning.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/data-partitioning/auto-partitioning.md
index de2ffa9a7dd..41f793fcbb0 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/data-partitioning/auto-partitioning.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/data-partitioning/auto-partitioning.md
@@ -103,7 +103,7 @@ PROPERTIES (
```sql
CREATE TABLE `date_table` (
- `TIME_STAMP` datev2 NOT NULL COMMENT '采集日期'
+ `TIME_STAMP` datev2 NOT NULL
) ENGINE=OLAP
DUPLICATE KEY(`TIME_STAMP`)
AUTO PARTITION BY RANGE (date_trunc(`TIME_STAMP`, 'month'))
@@ -203,8 +203,8 @@ ERROR 1105 (HY000): errCode = 2, detailMessage = AUTO RANGE
PARTITION doesn't su
```sql
CREATE TABLE `DAILY_TRADE_VALUE`
(
- `TRADE_DATE` datev2 NOT NULL COMMENT '交易日期',
- `TRADE_ID` varchar(40) NOT NULL COMMENT '交易编号',
+ `TRADE_DATE` datev2 NOT NULL,
+ `TRADE_ID` varchar(40) NOT NULL,
......
)
UNIQUE KEY(`TRADE_DATE`, `TRADE_ID`)
@@ -311,6 +311,3 @@ mysql> select * from
partitions("catalog"="internal","database"="optest","table"
-
在使用[insert-overwrite](../../sql-manual/sql-statements/data-modification/DML/INSERT-OVERWRITE)插入数据时
AUTO PARTITION 表的行为详见 INSERT OVERWRITE 文档。
- 如果导入创建分区时，该表涉及其他元数据操作（如 Schema Change、Rebalance），则导入可能失败。
-## 关键词
-
-AUTO, PARTITION, AUTO_PARTITION
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/data-partitioning/manual-partitioning.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/data-partitioning/manual-partitioning.md
index 0223077f6fc..17cae0b77e5 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/data-partitioning/manual-partitioning.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/data-partitioning/manual-partitioning.md
@@ -27,7 +27,7 @@ under the License.
## 分区列
-- 分区列可以指定一列或多列，分区列必须为 KEY 列。多列分区的使用方式在后面多列分区小结介绍。
+- 分区列可以指定一列或多列，分区列必须为 KEY 列。
- PARTITION 列默认必须为 NOT NULL 列，如果需要使用 NULL 列，应设置 session variable
`allow_partition_column_nullable = true`。对于 LIST PARTITION，支持真正的 NULL 分区。对于
RANGE PARTITION，NULL 值会被划归**最小的 LESS THAN 分区**。
- 不论分区列是什么类型，在写分区值时，都需要加双引号。
- 分区数量理论上没有上限。但默认限制每张表 4096 个分区，如果想突破这个限制，可以修改 FE
配置`max_multi_partition_num`和`max_dynamic_partition_num `。
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/index/inverted-index.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/index/inverted-index.md
index 6666a347a35..8272a686c78 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/index/inverted-index.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/index/inverted-index.md
@@ -294,6 +294,7 @@ SELECT * FROM table_name WHERE content MATCH_ALL 'keyword1
keyword2';
-- 'keyword1 keyword2'，'wordx keyword1 keyword2'，'wordx keyword1 keyword2
wordy' 能匹配，因为他们都包含 keyword1 keyword2，而且 keyword2 紧跟在 keyword1 后面
-- 'keyword1 wordx keyword2' 不能匹配，因为 keyword1 keyword2 之间隔了一个词 wordx
-- 'keyword2 keyword1'，因为 keyword1 keyword2 的顺序反了
+-- 使用 MATCH_PHRASE 需要再 PROPERTIES 中开启 "support_phrase" = "true"
SELECT * FROM table_name WHERE content MATCH_PHRASE 'keyword1 keyword2';
-- 2.2 content 列中同时包含 keyword1 和 keyword2 的行，而且 keyword1 keyword2 的
`词距`（slop）不超过 3
@@ -375,11 +376,11 @@ mysql> SELECT TOKENIZE('I love
Doris','"parser"="english"');
+------------------------------------------------+
1 row in set (0.02 sec)
-mysql> SELECT TOKENIZE('I love CHINA 我爱我的祖国','"parser"="unicode"');
+mysql> SELECT TOKENIZE('I love CHINA','"parser"="unicode"');
+-------------------------------------------------------------------+
-| tokenize('I love CHINA 我爱我的祖国', '"parser"="unicode"') |
+| tokenize('I love CHINA', '"parser"="unicode"') |
+-------------------------------------------------------------------+
-| ["i", "love", "china", "我", "爱", "我", "的", "祖", "国"] |
+| ["i", "love", "china"] |
+-------------------------------------------------------------------+
1 row in set (0.02 sec)
```
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0.json
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0.json
index 4e600cde006..af899f7f61b 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0.json
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0.json
@@ -167,7 +167,7 @@
"message": "物化视图",
"description": "The label for category View and Materialize View in
sidebar docs"
},
- "sidebar.docs.category.Async-Materialize View": {
+ "sidebar.docs.category.Async-Materialized View": {
"message": "异步物化视图",
"description": "The label for category View and Materialize View in
sidebar docs"
},
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/admin-manual/data-admin/recyclebin.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/admin-manual/data-admin/recyclebin.md
index 6ad0822c7ba..5bc1d3adf1b 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/admin-manual/data-admin/recyclebin.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/admin-manual/data-admin/recyclebin.md
@@ -24,13 +24,9 @@ specific language governing permissions and limitations
under the License.
-->
-## 数据生命周期
-
-当用户执行`DROP
DATABASE/TABLE/PARTITION`命令而不使用`FORCE`时，Doris会将删除的数据库、表或分区移动到回收站。可以使用`RECOVER`命令从回收站恢复已删除的数据库、表或分区的所有数据，使其再次可见。
-
## 从回收站恢复
-
-为了避免因误操作造成的灾难，Doris支持意外删除的数据库、表和分区的数据恢复。在删除表或数据库后，Doris不会立即物理删除数据。相反，它会在一定时间内将其移动到垃圾箱（默认是1天，可以通过`catalog_trash_expire_second`参数在`fe.conf`中进行配置）。管理员可以使用`RECOVER`命令恢复意外删除的数据。
+为了避免因误操作造成的灾难，Doris支持意外删除的数据库、表和分区的数据恢复。在删除表或数据库后，Doris不会立即物理删除数据。
+当用户执行`DROP
DATABASE/TABLE/PARTITION`命令而不使用`FORCE`时，Doris会将删除的数据库、表或分区移动到回收站。可以使用`RECOVER`命令从回收站恢复已删除的数据库、表或分区的所有数据，使其再次可见。
**注意：** 如果使用`DROP FORCE`执行删除，则数据将立即被删除，无法恢复。
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/data-operate/delete/delete-overview.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/data-operate/delete/delete-overview.md
index 395783dc90d..715c7abc865 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/data-operate/delete/delete-overview.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/data-operate/delete/delete-overview.md
@@ -71,6 +71,5 @@ TRUNCATE TABLE table_name;
## 注意事项
1. 删除操作会生成新的数据版本，因此频繁执行删除可能会导致版本数量增加，从而影响查询性能。
-2. 合并压缩是释放存储空间的关键步骤，建议用户根据系统负载调整压缩策略。
-3. 删除后的数据在合并压缩完成之前仍会占用存储，因此删除操作本身不会立即降低存储使用。
+2. 删除后的数据在合并压缩完成之前仍会占用存储，因此删除操作本身不会立即降低存储使用。
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/table-design/data-partitioning/auto-partitioning.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/table-design/data-partitioning/auto-partitioning.md
index 9ddb61be133..52aec074b3e 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/table-design/data-partitioning/auto-partitioning.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/table-design/data-partitioning/auto-partitioning.md
@@ -103,7 +103,7 @@ PROPERTIES (
```sql
CREATE TABLE `date_table` (
- `TIME_STAMP` datev2 NOT NULL COMMENT '采集日期'
+ `TIME_STAMP` datev2 NOT NULL
) ENGINE=OLAP
DUPLICATE KEY(`TIME_STAMP`)
AUTO PARTITION BY RANGE (date_trunc(`TIME_STAMP`, 'month'))
@@ -203,8 +203,8 @@ ERROR 1105 (HY000): errCode = 2, detailMessage = AUTO RANGE
PARTITION doesn't su
```sql
CREATE TABLE `DAILY_TRADE_VALUE`
(
- `TRADE_DATE` datev2 NOT NULL COMMENT '交易日期',
- `TRADE_ID` varchar(40) NOT NULL COMMENT '交易编号',
+ `TRADE_DATE` datev2 NOT NULL,
+ `TRADE_ID` varchar(40) NOT NULL,
......
)
UNIQUE KEY(`TRADE_DATE`, `TRADE_ID`)
@@ -303,6 +303,4 @@ mysql> select * from
partitions("catalog"="internal","database"="optest","table"
-
在使用[insert-overwrite](../../sql-manual/sql-statements/data-modification/DML/INSERT-OVERWRITE)插入数据时
AUTO PARTITION 表的行为详见 INSERT OVERWRITE 文档。
- 如果导入创建分区时，该表涉及其他元数据操作（如 Schema Change、Rebalance），则导入可能失败。
-## 关键词
-AUTO, PARTITION, AUTO_PARTITION
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/table-design/data-partitioning/manual-partitioning.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/table-design/data-partitioning/manual-partitioning.md
index 65341383860..1453538599c 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/table-design/data-partitioning/manual-partitioning.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/table-design/data-partitioning/manual-partitioning.md
@@ -27,7 +27,7 @@ under the License.
## 分区列
-- 分区列可以指定一列或多列，分区列必须为 KEY 列。多列分区的使用方式在后面多列分区小结介绍。
+- 分区列可以指定一列或多列，分区列必须为 KEY 列。
- PARTITION 列默认必须为 NOT NULL 列，如果需要使用 NULL 列，应设置 session variable
`allow_partition_column_nullable = true`。对于 LIST PARTITION，支持真正的 NULL 分区。对于
RANGE PARTITION，NULL 值会被划归**最小的 LESS THAN 分区**。
- 不论分区列是什么类型，在写分区值时，都需要加双引号。
- 分区数量理论上没有上限。但默认限制每张表 4096 个分区，如果想突破这个限制，可以修改 FE
配置`max_multi_partition_num`和`max_dynamic_partition_num `。
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/table-design/index/inverted-index.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/table-design/index/inverted-index.md
index 78b3da13ceb..2adc8bad10f 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/table-design/index/inverted-index.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/table-design/index/inverted-index.md
@@ -294,6 +294,7 @@ SELECT * FROM table_name WHERE content MATCH_ALL 'keyword1
keyword2';
-- 'keyword1 keyword2'，'wordx keyword1 keyword2'，'wordx keyword1 keyword2
wordy' 能匹配，因为他们都包含 keyword1 keyword2，而且 keyword2 紧跟在 keyword1 后面
-- 'keyword1 wordx keyword2' 不能匹配，因为 keyword1 keyword2 之间隔了一个词 wordx
-- 'keyword2 keyword1'，因为 keyword1 keyword2 的顺序反了
+-- 使用 MATCH_PHRASE 需要再 PROPERTIES 中开启 "support_phrase" = "true"
SELECT * FROM table_name WHERE content MATCH_PHRASE 'keyword1 keyword2';
-- 2.2 content 列中同时包含 keyword1 和 keyword2 的行，而且 keyword1 keyword2 的
`词距`（slop）不超过 3
diff --git a/sidebars.json b/sidebars.json
index 35af55c5b7c..3b986e7d69e 100644
--- a/sidebars.json
+++ b/sidebars.json
@@ -286,7 +286,7 @@
"query-acceleration/materialized-view/sync-materialized-view",
{
"type": "category",
- "label": "Async-Materialize View",
+ "label": "Async-Materialized View",
"items": [
"query-acceleration/materialized-view/async-materialized-view/overview",
"query-acceleration/materialized-view/async-materialized-view/functions-and-demands",
diff --git a/versioned_docs/version-2.1/admin-manual/data-admin/recyclebin.md
b/versioned_docs/version-2.1/admin-manual/data-admin/recyclebin.md
index 95bcab15e91..9eda0f825f6 100644
--- a/versioned_docs/version-2.1/admin-manual/data-admin/recyclebin.md
+++ b/versioned_docs/version-2.1/admin-manual/data-admin/recyclebin.md
@@ -24,13 +24,9 @@ specific language governing permissions and limitations
under the License.
-->
-## Data Lifecycle
-
-When a user executes the `DROP DATABASE/TABLE/PARTITION` command without
`FORCE`, Doris moves the deleted database, table, or partition to the recycle
bin. The `RECOVER` command can be used to restore all data of the deleted
database, table, or partition from the recycle bin, making them visible again.
-
## Recover from Recycle Bin
-In order to avoid disasters caused by misoperation, Doris supports data
recovery of accidentally deleted databases, tables, and partitions. After
dropping a table or database, Doris does not physically delete the data
immediately. Instead, it is moved to the trash for a certain period of time
(the default is 1 day, which can be configured through the
`catalog_trash_expire_second` parameter in `fe.conf`). The administrator can
use the `RECOVER` command to restore accidentally deleted data.
+To avoid disasters caused by accidental operations, Doris supports the
recovery of accidentally deleted databases, tables, and partitions. After
deleting a table or database, Doris does not immediately physically delete the
data. When the user executes the `DROP DATABASE/TABLE/PARTITION` command
without using `FORCE`, Doris moves the deleted database, table, or partition to
the recycle bin. The `RECOVER` command can be used to restore all data of the
deleted database, table, or partition [...]
**Note:** If the deletion was performed using `DROP FORCE`, the data will be
immediately deleted and cannot be recovered.
diff --git a/versioned_docs/version-2.1/data-operate/delete/delete-overview.md
b/versioned_docs/version-2.1/data-operate/delete/delete-overview.md
index 994f2274c7e..52e7d43c78d 100644
--- a/versioned_docs/version-2.1/data-operate/delete/delete-overview.md
+++ b/versioned_docs/version-2.1/data-operate/delete/delete-overview.md
@@ -72,6 +72,5 @@ In some cases, users may want to rewrite the data of a
partition. If the data is
## Notes
1. The delete operation generates new data versions, so frequent deletions may
increase the number of versions, affecting query performance.
-2. Compaction is a key step in freeing up storage space. Users are advised to
adjust the compaction strategy based on system load.
-3. Deleted data will still occupy storage until compaction is completed, so
the delete operation itself will not immediately reduce storage usage.
+2. Deleted data will still occupy storage until compaction is completed, so
the delete operation itself will not immediately reduce storage usage.
diff --git a/versioned_docs/version-2.1/query-acceleration/sql-cache-manual.md
b/versioned_docs/version-2.1/query-acceleration/sql-cache-manual.md
index 916e9f65211..995be3a6756 100644
--- a/versioned_docs/version-2.1/query-acceleration/sql-cache-manual.md
+++ b/versioned_docs/version-2.1/query-acceleration/sql-cache-manual.md
@@ -26,7 +26,7 @@ under the License.
## Description
-SQL Cache is a query optimization mechanism provided by Doris that can
significantly enhance query performance. It reduces redundant computations by
caching query results, making it suitable for scenarios where data update
frequency is low.
+SQL Cache is a query optimization mechanism provided by Doris that can
significantly enhance query performance. It reduces redundant computations by
caching query results, making it suitable for scenarios where data update
infrequently.
SQL Cache stores and retrieves caches based on the following key factors:
diff --git
a/versioned_docs/version-2.1/table-design/data-partitioning/auto-partitioning.md
b/versioned_docs/version-2.1/table-design/data-partitioning/auto-partitioning.md
index d4d92590574..58a8731a8d3 100644
---
a/versioned_docs/version-2.1/table-design/data-partitioning/auto-partitioning.md
+++
b/versioned_docs/version-2.1/table-design/data-partitioning/auto-partitioning.md
@@ -311,6 +311,3 @@ For a detailed grammar description, see:
[auto_partition_name](../../sql-manual/
- When use
[insert-overwrite](../../sql-manual/sql-statements/data-modification/DML/INSERT-OVERWRITE)
to load data into Auto Partition table, the behaviour is detailed in the
INSERT OVERWRITE documentation.
- If metadata operations are involved when importing and creating partitions,
the import process may fail.
-## Keywords
-
-AUTO, PARTITION, AUTO_PARTITION
diff --git
a/versioned_docs/version-2.1/table-design/data-partitioning/manual-partitioning.md
b/versioned_docs/version-2.1/table-design/data-partitioning/manual-partitioning.md
index fbb127d41e0..e7597dc4933 100644
---
a/versioned_docs/version-2.1/table-design/data-partitioning/manual-partitioning.md
+++
b/versioned_docs/version-2.1/table-design/data-partitioning/manual-partitioning.md
@@ -27,7 +27,7 @@ under the License.
## Partition columns
-- Partition columns can be specified as one or multiple columns, and the
partition columns must be KEY columns. The usage of multi-column partitioning
will be introduced later in the summary section of multi-column partitioning.
+- Partition columns can be specified as one or multiple columns, and the
partition columns must be KEY columns.
- When `allow_partition_column_nullable` is set to true, Range partition
supports the use of NULL partition columns. List Partition does not support
NULL partition columns at all times.
diff --git a/versioned_docs/version-2.1/table-design/index/inverted-index.md
b/versioned_docs/version-2.1/table-design/index/inverted-index.md
index 7e86a2bd50d..da8359834b8 100644
--- a/versioned_docs/version-2.1/table-design/index/inverted-index.md
+++ b/versioned_docs/version-2.1/table-design/index/inverted-index.md
@@ -288,6 +288,7 @@ SELECT * FROM table_name WHERE content MATCH_ALL 'keyword1
keyword2';
-- 'keyword1 keyword2', 'wordx keyword1 keyword2', 'wordx keyword1 keyword2
wordy' all match because they contain 'keyword1 keyword2' with keyword2
immediately following keyword1
-- 'keyword1 wordx keyword2' does not match because there is a word between
keyword1 and keyword2
-- 'keyword2 keyword1' does not match because the order is reversed
+-- To use MATCH_PHRASE, you need to enable "support_phrase" = "true" in
PROPERTIES.
SELECT * FROM table_name WHERE content MATCH_PHRASE 'keyword1 keyword2';
-- 2.2 Rows in the content column containing both keyword1 and keyword2, with
a slop (maximum word distance) of 3
diff --git
a/versioned_docs/version-2.1/table-design/tiered-storage/remote-storage.md
b/versioned_docs/version-2.1/table-design/tiered-storage/remote-storage.md
index 6c646befa84..0b8c4ab8f37 100644
--- a/versioned_docs/version-2.1/table-design/tiered-storage/remote-storage.md
+++ b/versioned_docs/version-2.1/table-design/tiered-storage/remote-storage.md
@@ -205,7 +205,7 @@ To optimize query performance and save object storage
resources, local Cache has
For specific configurations, please refer to (../../lakehouse/filecache).
-## Common Issues
+## FAQ
1. `ERROR 1105 (HY000): errCode = 2, detailMessage = Failed to create
repository: connect to s3 failed: Unable to marshall request to JSON: host must
not be null.`
diff --git a/versioned_docs/version-3.0/admin-manual/data-admin/recyclebin.md
b/versioned_docs/version-3.0/admin-manual/data-admin/recyclebin.md
index 95bcab15e91..9eda0f825f6 100644
--- a/versioned_docs/version-3.0/admin-manual/data-admin/recyclebin.md
+++ b/versioned_docs/version-3.0/admin-manual/data-admin/recyclebin.md
@@ -24,13 +24,9 @@ specific language governing permissions and limitations
under the License.
-->
-## Data Lifecycle
-
-When a user executes the `DROP DATABASE/TABLE/PARTITION` command without
`FORCE`, Doris moves the deleted database, table, or partition to the recycle
bin. The `RECOVER` command can be used to restore all data of the deleted
database, table, or partition from the recycle bin, making them visible again.
-
## Recover from Recycle Bin
-In order to avoid disasters caused by misoperation, Doris supports data
recovery of accidentally deleted databases, tables, and partitions. After
dropping a table or database, Doris does not physically delete the data
immediately. Instead, it is moved to the trash for a certain period of time
(the default is 1 day, which can be configured through the
`catalog_trash_expire_second` parameter in `fe.conf`). The administrator can
use the `RECOVER` command to restore accidentally deleted data.
+To avoid disasters caused by accidental operations, Doris supports the
recovery of accidentally deleted databases, tables, and partitions. After
deleting a table or database, Doris does not immediately physically delete the
data. When the user executes the `DROP DATABASE/TABLE/PARTITION` command
without using `FORCE`, Doris moves the deleted database, table, or partition to
the recycle bin. The `RECOVER` command can be used to restore all data of the
deleted database, table, or partition [...]
**Note:** If the deletion was performed using `DROP FORCE`, the data will be
immediately deleted and cannot be recovered.
diff --git a/versioned_docs/version-3.0/data-operate/delete/delete-overview.md
b/versioned_docs/version-3.0/data-operate/delete/delete-overview.md
index 994f2274c7e..52e7d43c78d 100644
--- a/versioned_docs/version-3.0/data-operate/delete/delete-overview.md
+++ b/versioned_docs/version-3.0/data-operate/delete/delete-overview.md
@@ -72,6 +72,5 @@ In some cases, users may want to rewrite the data of a
partition. If the data is
## Notes
1. The delete operation generates new data versions, so frequent deletions may
increase the number of versions, affecting query performance.
-2. Compaction is a key step in freeing up storage space. Users are advised to
adjust the compaction strategy based on system load.
-3. Deleted data will still occupy storage until compaction is completed, so
the delete operation itself will not immediately reduce storage usage.
+2. Deleted data will still occupy storage until compaction is completed, so
the delete operation itself will not immediately reduce storage usage.
diff --git a/versioned_docs/version-3.0/query-acceleration/sql-cache-manual.md
b/versioned_docs/version-3.0/query-acceleration/sql-cache-manual.md
index 916e9f65211..995be3a6756 100644
--- a/versioned_docs/version-3.0/query-acceleration/sql-cache-manual.md
+++ b/versioned_docs/version-3.0/query-acceleration/sql-cache-manual.md
@@ -26,7 +26,7 @@ under the License.
## Description
-SQL Cache is a query optimization mechanism provided by Doris that can
significantly enhance query performance. It reduces redundant computations by
caching query results, making it suitable for scenarios where data update
frequency is low.
+SQL Cache is a query optimization mechanism provided by Doris that can
significantly enhance query performance. It reduces redundant computations by
caching query results, making it suitable for scenarios where data update
infrequently.
SQL Cache stores and retrieves caches based on the following key factors:
diff --git
a/versioned_docs/version-3.0/table-design/data-partitioning/auto-partitioning.md
b/versioned_docs/version-3.0/table-design/data-partitioning/auto-partitioning.md
index 1d13567a52e..f024ff835b1 100644
---
a/versioned_docs/version-3.0/table-design/data-partitioning/auto-partitioning.md
+++
b/versioned_docs/version-3.0/table-design/data-partitioning/auto-partitioning.md
@@ -311,6 +311,3 @@ For a detailed grammar description, see:
[auto_partition_name](../../sql-manual/
- When use
[insert-overwrite](../../sql-manual/sql-statements/data-modification/DML/INSERT-OVERWRITE)
to load data into Auto Partition table, the behaviour is detailed in the
INSERT OVERWRITE documentation.
- If metadata operations are involved when importing and creating partitions,
the import process may fail.
-## Keywords
-
-AUTO, PARTITION, AUTO_PARTITION
diff --git
a/versioned_docs/version-3.0/table-design/data-partitioning/manual-partitioning.md
b/versioned_docs/version-3.0/table-design/data-partitioning/manual-partitioning.md
index ebc92d9c8bb..789a5c95d3e 100644
---
a/versioned_docs/version-3.0/table-design/data-partitioning/manual-partitioning.md
+++
b/versioned_docs/version-3.0/table-design/data-partitioning/manual-partitioning.md
@@ -27,7 +27,7 @@ under the License.
## Partition columns
-- Partition columns can be specified as one or multiple columns, and the
partition columns must be KEY columns. The usage of multi-column partitioning
will be introduced later in the summary section of multi-column partitioning.
+- Partition columns can be specified as one or multiple columns, and the
partition columns must be KEY columns.
- When `allow_partition_column_nullable` is set to true, Range partition
supports the use of NULL partition columns. List Partition does not support
NULL partition columns at all times.
diff --git a/versioned_docs/version-3.0/table-design/index/inverted-index.md
b/versioned_docs/version-3.0/table-design/index/inverted-index.md
index c0213223f3e..b4298228c39 100644
--- a/versioned_docs/version-3.0/table-design/index/inverted-index.md
+++ b/versioned_docs/version-3.0/table-design/index/inverted-index.md
@@ -291,6 +291,7 @@ SELECT * FROM table_name WHERE content MATCH_ALL 'keyword1
keyword2';
-- 'keyword1 keyword2', 'wordx keyword1 keyword2', 'wordx keyword1 keyword2
wordy' all match because they contain 'keyword1 keyword2' with keyword2
immediately following keyword1
-- 'keyword1 wordx keyword2' does not match because there is a word between
keyword1 and keyword2
-- 'keyword2 keyword1' does not match because the order is reversed
+-- To use MATCH_PHRASE, you need to enable "support_phrase" = "true" in
PROPERTIES.
SELECT * FROM table_name WHERE content MATCH_PHRASE 'keyword1 keyword2';
-- 2.2 Rows in the content column containing both keyword1 and keyword2, with
a slop (maximum word distance) of 3
diff --git
a/versioned_docs/version-3.0/table-design/tiered-storage/remote-storage.md
b/versioned_docs/version-3.0/table-design/tiered-storage/remote-storage.md
index 6c646befa84..0b8c4ab8f37 100644
--- a/versioned_docs/version-3.0/table-design/tiered-storage/remote-storage.md
+++ b/versioned_docs/version-3.0/table-design/tiered-storage/remote-storage.md
@@ -205,7 +205,7 @@ To optimize query performance and save object storage
resources, local Cache has
For specific configurations, please refer to (../../lakehouse/filecache).
-## Common Issues
+## FAQ
1. `ERROR 1105 (HY000): errCode = 2, detailMessage = Failed to create
repository: connect to s3 failed: Unable to marshall request to JSON: host must
not be null.`
diff --git a/versioned_sidebars/version-2.1-sidebars.json
b/versioned_sidebars/version-2.1-sidebars.json
index 613852cc31d..23f15f27c1d 100644
--- a/versioned_sidebars/version-2.1-sidebars.json
+++ b/versioned_sidebars/version-2.1-sidebars.json
@@ -262,7 +262,7 @@
"query-acceleration/materialized-view/sync-materialized-view",
{
"type": "category",
- "label": "Async-Materialize View",
+ "label": "Async-Materialized View",
"items": [
"query-acceleration/materialized-view/async-materialized-view/overview",
"query-acceleration/materialized-view/async-materialized-view/functions-and-demands",
diff --git a/versioned_sidebars/version-3.0-sidebars.json
b/versioned_sidebars/version-3.0-sidebars.json
index 57fd445805b..47a8ef4bf03 100644
--- a/versioned_sidebars/version-3.0-sidebars.json
+++ b/versioned_sidebars/version-3.0-sidebars.json
@@ -286,7 +286,7 @@
"query-acceleration/materialized-view/sync-materialized-view",
{
"type": "category",
- "label": "Async-Materialize View",
+ "label": "Async-Materialized View",
"items": [
"query-acceleration/materialized-view/async-materialized-view/overview",
"query-acceleration/materialized-view/async-materialized-view/functions-and-demands",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
