You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ma...@apache.org on 2022/11/26 07:41:09 UTC
[iotdb] branch update-compaction-docs created (now dbf76c8895)
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a change to branch update-compaction-docs
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at dbf76c8895 remove merge statement from docs
This branch includes the following new commits:
new dbf76c8895 remove merge statement from docs
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: remove merge statement from docs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a commit to branch update-compaction-docs
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit dbf76c8895fe188954cd641584fef9689a34e9ff
Author: LiuXuxin <li...@outlook.com>
AuthorDate: Sat Nov 26 15:40:54 2022 +0800
remove merge statement from docs
---
.../Maintenance-Tools/Maintenance-Command.md | 19 -------------------
.../Maintenance-Tools/Maintenance-Command.md | 19 -------------------
docs/zh/UserGuide/Reference/Common-Config-Manual.md | 12 ++++++------
3 files changed, 6 insertions(+), 44 deletions(-)
diff --git a/docs/UserGuide/Maintenance-Tools/Maintenance-Command.md b/docs/UserGuide/Maintenance-Tools/Maintenance-Command.md
index ee3807a9ef..7f545db2a6 100644
--- a/docs/UserGuide/Maintenance-Tools/Maintenance-Command.md
+++ b/docs/UserGuide/Maintenance-Tools/Maintenance-Command.md
@@ -37,25 +37,6 @@ IoTDB> FLUSH root.sg1,root.sg2 ON LOCAL
IoTDB> FLUSH root.sg1,root.sg2 ON CLUSTER
```
-## MERGE
-
-Execute Level Compaction and unsequence Compaction task. Currently IoTDB supports the following two types of SQL to manually trigger the compaction process of data files:
-
-* `MERGE` Execute the level compaction first and then execute the unsequence compaction. In unsequence compaction process, this command is executed very fast by rewriting the overlapped Chunks only, while there is some redundant data on the disk eventually.
-* `FULL MERGE` Execute the level compaction first and then execute the unsequence compaction. In unsequence compaction process, this command is executed slow due to it takes more time to rewrite all data in overlapped files. However, there won't be any redundant data on the disk eventually.
-
-```sql
-IoTDB> MERGE
-IoTDB> FULL MERGE
-```
-At the same time, manually trigger the compaction process of data files are supported for local node or the entire cluster in cluster mode:
-```sql
-IoTDB> MERGE ON LOCAL
-IoTDB> MERGE ON CLUSTER
-IoTDB> FULL MERGE ON LOCAL
-IoTDB> FULL MERGE ON CLUSTER
-```
-
## CLEAR CACHE
Clear the cache of chunk, chunk metadata and timeseries metadata to release the memory footprint. In cluster mode, we provide commands to clear local node cache and clear the cluster cache.
diff --git a/docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md b/docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md
index c2afa6714e..5e5204a42d 100644
--- a/docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md
+++ b/docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md
@@ -36,25 +36,6 @@ IoTDB> FLUSH root.sg1,root.sg2 ON LOCAL
IoTDB> FLUSH root.sg1,root.sg2 ON CLUSTER
```
-## MERGE
-
-触发层级合并和乱序合并。当前 IoTDB 支持使用如下两种 SQL 手动触发数据文件的合并：
-
-* `MERGE` 先触发层级合并，等层级合并执行完后，再触发乱序合并。在乱序合并中，仅重写重复的 Chunk，整理速度快，但是最终磁盘会存在多余数据。
-* `FULL MERGE` 先触发层级合并，等层级合并执行完后，再触发乱序合并。在乱序合并中，将需要合并的顺序和乱序文件的所有数据都重新写一份，整理速度慢，最终磁盘将不存在无用的数据。
-
-```sql
-IoTDB> MERGE
-IoTDB> FULL MERGE
-```
-同时，在集群模式中支持对本节点或整个集群手动触发数据文件的合并:
-```sql
-IoTDB> MERGE ON LOCAL
-IoTDB> MERGE ON CLUSTER
-IoTDB> FULL MERGE ON LOCAL
-IoTDB> FULL MERGE ON CLUSTER
-```
-
## CLEAR CACHE
diff --git a/docs/zh/UserGuide/Reference/Common-Config-Manual.md b/docs/zh/UserGuide/Reference/Common-Config-Manual.md
index 4e114d2934..d218abc210 100644
--- a/docs/zh/UserGuide/Reference/Common-Config-Manual.md
+++ b/docs/zh/UserGuide/Reference/Common-Config-Manual.md
@@ -895,12 +895,12 @@ IoTDB ConfigNode 和 DataNode 的通用配置参数位于 `conf` 目录下。
* cross\_compaction\_memory\_budget
-|名字| cross\_compaction\_memory\_budget |
-|:---:|:---|
-|描述| 一个合并任务可以使用多少内存（以字节为单位），默认为最大JVM内存的10%。这只是一个粗略的估计，从一个比较小的值开始，避免OOM。每个新的合并线程可能会占用这样的内存，所以merge_thread_num * merge_memory_budget是合并的预估总内存。|
-|类型| int32 |
-|默认值| 2147483648 |
-|改后生效方式| 重启服务生效|
+|名字| cross\_compaction\_memory\_budget |
+|:---:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|描述| 一个合并任务可以使用多少内存（以字节为单位），默认为最大JVM内存的10%。这只是一个粗略的估计，从一个比较小的值开始，避免OOM。每个新的合并线程可能会占用这样的内存，所以compaction\_thread\_count * cross\_compaction\_memory\_budget是合并的预估总内存。 |
+|类型| int32 |
+|默认值| 2147483648 |
+|改后生效方式| 重启服务生效 |
* compaction\_thread\_count