This is an automated email from the ASF dual-hosted git repository.
zhaoxinyi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 222b67a0 Modify compaction configuration descriptions (#380)
222b67a0 is described below
commit 222b67a056b2307ea8aa7deef2d2a4e44421dfbd
Author: shuwenwei <[email protected]>
AuthorDate: Fri Oct 25 17:18:20 2024 +0800
Modify compaction configuration descriptions (#380)
* modify compaction configuration descriptions
* Update src/zh/UserGuide/latest/Reference/Common-Config-Manual.md
Co-authored-by: Haonan <[email protected]>
* Update src/zh/UserGuide/latest/Reference/Common-Config-Manual.md
Co-authored-by: Haonan <[email protected]>
* Update src/zh/UserGuide/Master/Reference/Common-Config-Manual.md
Co-authored-by: Haonan <[email protected]>
---------
Co-authored-by: Haonan <[email protected]>
---
.../Master/Reference/Common-Config-Manual.md | 156 ++++++++++++++-------
.../latest/Reference/Common-Config-Manual.md | 96 ++++++-------
.../Master/Reference/Common-Config-Manual.md | 136 +++++++++++++-----
.../latest/Reference/Common-Config-Manual.md | 82 ++++++-----
4 files changed, 295 insertions(+), 175 deletions(-)
diff --git a/src/UserGuide/Master/Reference/Common-Config-Manual.md
b/src/UserGuide/Master/Reference/Common-Config-Manual.md
index 95bac012..3d1f0ce3 100644
--- a/src/UserGuide/Master/Reference/Common-Config-Manual.md
+++ b/src/UserGuide/Master/Reference/Common-Config-Manual.md
@@ -374,12 +374,12 @@ Different configuration parameters take effect in the
following three ways:
* schema\_engine\_mode
-|名字| schema\_engine\_mode
|
-|:---:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|Description| Schema engine mode, supporting Memory and PBTree modes; PBTree
mode support evict the timeseries schema temporarily not used in memory at
runtime, and load it into memory from disk when needed. This parameter must be
the same on all DataNodes in one cluster. |
-|Type| string
|
-|Default| Memory
|
-|Effective| Only allowed to be modified in first start up
|
+| Name | schema\_engine\_mode
|
+|:-----------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Description | Schema engine mode, supporting Memory and PBTree modes; PBTree
mode support evict the timeseries schema temporarily not used in memory at
runtime, and load it into memory from disk when needed. This parameter must be
the same on all DataNodes in one cluster. |
+| Type | string
|
+| Default | Memory
|
+| Effective | Only allowed to be modified in first start up
|
* mlog\_buffer\_size
@@ -839,6 +839,15 @@ Different configuration parameters take effect in the
following three ways:
| Default | true
|
| Effective | hot-load
|
+* enable\_auto\_repair\_compaction
+
+| Name | enable\_auto\_repair\_compaction
|
+| :---------:
|:------------------------------------------------------------------|
+| Description | enable auto repair unsorted file by compaction |
+| Type | Boolean
|
+| Default | true
|
+| Effective | hot-load
|
+
* cross\_selector
|Name| cross\_selector |
@@ -859,12 +868,12 @@ Different configuration parameters take effect in the
following three ways:
* inner\_seq\_selector
-|Name| inner\_seq\_selector |
-|:---:|:----------------------------------------------------------|
-|Description| the task selector type of inner sequence space compaction |
-|Type| String |
-|Default| size\_tiered |
-|Effective| After restart system |
+|Name| inner\_seq\_selector
|
+|:---:|:-----------------------------------------------------------------------------------------------------------------------------|
+|Description| the task selector type of inner sequence space compaction.
Options: size\_tiered\_single_\target,size\_tiered\_multi\_target |
+|Type| String
|
+|Default| hot-load
|
+|Effective| hot-load
|
* inner\_seq\_performer
@@ -879,10 +888,10 @@ Different configuration parameters take effect in the
following three ways:
|Name| inner\_unseq\_selector |
|:---:|:------------------------------------------------------------|
-|Description| the task selector type of inner unsequence space compaction |
+|Description| the task selector type of inner unsequence space compactionn.
Options: size\_tiered\_single_\target,size\_tiered\_multi\_target |
|Type| String |
-|Default| size\_tiered |
-|Effective| After restart system |
+|Default| hot-load |
+|Effective| hot-load |
* inner\_unseq\_performer
@@ -895,12 +904,12 @@ Different configuration parameters take effect in the
following three ways:
* compaction\_priority
-| Name | compaction\_priority
|
-| :---------: |
:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
+| Name | compaction\_priority
|
+| :---------:
|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Description | Priority of compaction task. When it is BALANCE, system
executes all types of compaction equally; when it is INNER\_CROSS, system takes
precedence over executing inner space compaction task; when it is CROSS\_INNER,
system takes precedence over executing cross space compaction task |
-| Type | String
|
-| Default | BALANCE
|
-| Effective | After restart system
|
+| Type | String
|
+| Default | INNER_CROSS
|
+| Effective | After restart system
|
* target\_compaction\_file\_size
@@ -947,14 +956,50 @@ Different configuration parameters take effect in the
following three ways:
|Default| 1000
|
|Effective| After restart system
|
-* max\_inner\_compaction\_candidate\_file\_num
+* inner\_compaction\_total\_file\_num\_threshold
-|Name| max\_inner\_compaction\_candidate\_file\_num |
-|:---:|:---|
+|Name| inner\_compaction\_total\_file\_num\_threshold |
+|:---:|:---------------------------------------------------------|
|Description| The max num of files encounter in inner space compaction |
-|Type| int32 |
-|Default| 30 |
-|Effective|After restart system|
+|Type| int32 |
+|Default| 100 |
+|Effective| hot-load |
+
+* inner\_compaction\_total\_file\_size\_threshold
+
+|Name| inner\_compaction\_total\_file\_size\_threshold |
+|:---:|:----------------------------------------------------------------|
+|Description| The total file size limit in inner space compaction. Unit: byte |
+|Type| int64 |
+|Default| 10737418240 |
+|Effective| hot-load |
+
+* compaction\_max\_aligned\_series\_num\_in\_one\_batch
+
+|Name| compaction\_max\_aligned\_series\_num\_in\_one\_batch |
+|:---:|:--------------------------------------------------------------------|
+|Description| How many value chunk will be compacted in aligned series
compaction |
+|Type| int32 |
+|Default| 10 |
+|Effective| hot-load
|
+
+* max\_level\_gap\_in\_inner\_compaction
+
+|Name| max\_level\_gap\_in\_inner\_compaction |
+|:---:|:------------------------------------------------|
+|Description| The max level gap in inner compaction selection |
+|Type| int32 |
+|Default| 2 |
+|Effective| hot-load |
+
+* inner\_compaction\_candidate\_file\_num
+
+|Name| inner\_compaction\_candidate\_file\_num
|
+|:---:|:-------------------------------------------------------------------------------|
+|Description| The file num requirement when selecting inner space compaction
candidate files |
+|Type| int32
|
+|Default| 30
|
+|Effective| hot-load
|
* max\_cross\_compaction\_file\_num
@@ -963,7 +1008,7 @@ Different configuration parameters take effect in the
following three ways:
|Description| The max num of files encounter in cross space compaction |
|Type| int32 |
|Default| 500 |
-|Effective| After restart system |
+|Effective| hot-load |
* max\_cross\_compaction\_file\_size
@@ -971,17 +1016,8 @@ Different configuration parameters take effect in the
following three ways:
|:---:|:----------------------------------------------------------|
|Description| The max size of files encounter in cross space compaction |
|Type| Int64 |
-|Default| 5368709120 |
-|Effective| After restart system |
-
-* cross\_compaction\_file\_selection\_time\_budget
-
-|Name| cross\_compaction\_file\_selection\_time\_budget |
-|:---:|:---|
-|Description| Time budget for cross space compaction file selection |
-|Type| int32 |
-|Default| 30000 |
-|Effective|After restart system|
+|Default| 5368709120 |
+|Effective| hot-load |
* compaction\_thread\_count
@@ -1012,12 +1048,30 @@ Different configuration parameters take effect in the
following three ways:
* compaction\_write\_throughput\_mb\_per\_sec
-|Name| compaction\_write\_throughput\_mb\_per\_sec |
-|:---:|:---|
-|Description| The write rate of all compaction tasks in MB/s |
-|Type| int32 |
-|Default| 16 |
-|Effective|After restart system|
+|Name| compaction\_write\_throughput\_mb\_per\_sec |
+|:---:|:-------------------------------------------------|
+|Description| The write rate of all compaction tasks in MB/s, values less than
or equal to 0 means no limit |
+|Type| int32 |
+|Default| 16 |
+|Effective| hot-load |
+
+* compaction\_read\_throughput\_mb\_per\_sec
+
+|Name| compaction\_read\_throughput\_mb\_per\_sec |
+|:---:|:------------------------------------------------|
+|Description| The read rate of all compaction tasks in MB/s, values less than
or equal to 0 means no limit |
+|Type| int32 |
+|Default| 0 |
+|Effective| hot-load |
+
+* compaction\_read\_operation\_per\_sec
+
+|Name| compaction\_read\_operation\_per\_sec
|
+|:---:|:---------------------------------------------------------------------------------------------------------------|
+|Description| The read operation of all compaction tasks can reach per second,
values less than or equal to 0 means no limit |
+|Type| int32
|
+|Default| 0
|
+|Effective| hot-load
|
* sub\_compaction\_thread\_count
@@ -1028,14 +1082,14 @@ Different configuration parameters take effect in the
following three ways:
|Default| 4
|
|Effective| hot-load
|
-* compaction\_validation\_level
+* enable\_tsfile\_validation
-| 名字 | compaction\_validation\_level
|
-|:-----------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Description | The level of validation after compaction. NONE: the validation
after compaction is disabled. RESOURCE_ONLY: the validation after compaction
check tsfile resource only. RESOURCE_AND_TSFILE: the validation after
compaction check resource and file. |
-| Type | String
|
-| Default | NONE
|
-| Effective | hot-load
|
+| Name | enable\_tsfile\_validation
|
+|:-----------:|:--------------------------------------------------------------------------|
+| Description | Verify that TSfiles generated by Flush, Load, and Compaction
are correct. |
+| Type | boolean
|
+| Default | false
|
+| Effective | hot-load
|
* candidate\_compaction\_task\_queue\_size
diff --git a/src/UserGuide/latest/Reference/Common-Config-Manual.md
b/src/UserGuide/latest/Reference/Common-Config-Manual.md
index 117b5145..3eb1100d 100644
--- a/src/UserGuide/latest/Reference/Common-Config-Manual.md
+++ b/src/UserGuide/latest/Reference/Common-Config-Manual.md
@@ -364,12 +364,12 @@ Different configuration parameters take effect in the
following three ways:
* schema\_engine\_mode
-|名字| schema\_engine\_mode
|
-|:---:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|Description| Schema engine mode, supporting Memory and PBTree modes; PBTree
mode support evict the timeseries schema temporarily not used in memory at
runtime, and load it into memory from disk when needed. This parameter must be
the same on all DataNodes in one cluster. |
-|Type| string
|
-|Default| Memory
|
-|Effective| Only allowed to be modified in first start up
|
+| Name | schema\_engine\_mode
|
+|:-----------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Description | Schema engine mode, supporting Memory and PBTree modes; PBTree
mode support evict the timeseries schema temporarily not used in memory at
runtime, and load it into memory from disk when needed. This parameter must be
the same on all DataNodes in one cluster. |
+| Type | string
|
+| Default | Memory
|
+| Effective | Only allowed to be modified in first start up
|
* mlog\_buffer\_size
@@ -894,12 +894,12 @@ Different configuration parameters take effect in the
following three ways:
* target\_compaction\_file\_size
-| Name | target\_compaction\_file\_size |
-| :---------: |:-----------------------------------------------|
+| Name | target\_compaction\_file\_size |
+| :---------: |:-----------------------------------|
| Description | The target file size in compaction |
-| Type | Int64 |
-| Default | 2147483648 |
-| Effective | After restart system |
+| Type | Int64 |
+| Default | 2147483648 |
+| Effective | hot-load |
* target\_chunk\_size
@@ -939,12 +939,12 @@ Different configuration parameters take effect in the
following three ways:
* max\_inner\_compaction\_candidate\_file\_num
-|Name| max\_inner\_compaction\_candidate\_file\_num |
-|:---:|:---|
+|Name| max\_inner\_compaction\_candidate\_file\_num |
+|:---:|:---------------------------------------------------------|
|Description| The max num of files encounter in inner space compaction |
-|Type| int32 |
-|Default| 30 |
-|Effective|After restart system|
+|Type| int32 |
+|Default| 30 |
+|Effective| hot-load |
* max\_cross\_compaction\_file\_num
@@ -953,7 +953,7 @@ Different configuration parameters take effect in the
following three ways:
|Description| The max num of files encounter in cross space compaction |
|Type| int32 |
|Default| 500 |
-|Effective| After restart system |
+|Effective| hot-load |
* max\_cross\_compaction\_file\_size
@@ -961,17 +961,8 @@ Different configuration parameters take effect in the
following three ways:
|:---:|:----------------------------------------------------------|
|Description| The max size of files encounter in cross space compaction |
|Type| Int64 |
-|Default| 5368709120 |
-|Effective| After restart system |
-
-* cross\_compaction\_file\_selection\_time\_budget
-
-|Name| cross\_compaction\_file\_selection\_time\_budget |
-|:---:|:---|
-|Description| Time budget for cross space compaction file selection |
-|Type| int32 |
-|Default| 30000 |
-|Effective|After restart system|
+|Default| 5368709120 |
+|Effective| hot-load |
* compaction\_thread\_count
@@ -991,23 +982,32 @@ Different configuration parameters take effect in the
following three ways:
| Default | 60000 |
| Effective | After restart system |
-* compaction\_submission\_interval\_in\_ms
-
-| Name | compaction\_submission\_interval\_in\_ms |
-| :---------: | :--------------------------------------- |
-| Description | interval of submitting compaction task |
-| Type | Int64 |
-| Default | 60000 |
-| Effective | After restart system |
-
* compaction\_write\_throughput\_mb\_per\_sec
-|Name| compaction\_write\_throughput\_mb\_per\_sec |
-|:---:|:---|
+|Name| compaction\_write\_throughput\_mb\_per\_sec |
+|:---:|:-----------------------------------------------|
|Description| The write rate of all compaction tasks in MB/s |
-|Type| int32 |
-|Default| 16 |
-|Effective|After restart system|
+|Type| int32 |
+|Default| 16 |
+|Effective| hot-load |
+
+* compaction\_read\_throughput\_mb\_per\_sec
+
+|Name| compaction\_read\_throughput\_mb\_per\_sec |
+|:---:|:------------------------------------------------|
+|Description| The read rate of all compaction tasks in MB/s, values less than
or equal to 0 means no limit |
+|Type| int32 |
+|Default| 0 |
+|Effective| hot-load |
+
+* compaction\_read\_operation\_per\_sec
+
+|Name| compaction\_read\_operation\_per\_sec
|
+|:---:|:---------------------------------------------------------------------------------------------------------------|
+|Description| The read operation of all compaction tasks can reach per second,
values less than or equal to 0 means no limit |
+|Type| int32
|
+|Default| 0
|
+|Effective| hot-load
|
* sub\_compaction\_thread\_count
@@ -1018,13 +1018,13 @@ Different configuration parameters take effect in the
following three ways:
|Default| 4
|
|Effective| hot-load
|
-* compaction\_validation\_level
+* enable\_tsfile\_validation
-| 名字 | compaction\_validation\_level
|
-|:-----------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Description | The level of validation after compaction. NONE: the validation
after compaction is disabled. RESOURCE_ONLY: the validation after compaction
check tsfile resource only. RESOURCE_AND_TSFILE: the validation after
compaction check resource and file. |
-| Type | String
|
-| Default | NONE
|
+| Name | enable\_tsfile\_validation
|
+|:-----------:|:--------------------------------------------------------------------------|
+| Description | Verify that TSfiles generated by Flush, Load, and Compaction
are correct. |
+| Type | boolean
|
+| Default | false
|
| Effective | hot-load
|
* candidate\_compaction\_task\_queue\_size
diff --git a/src/zh/UserGuide/Master/Reference/Common-Config-Manual.md
b/src/zh/UserGuide/Master/Reference/Common-Config-Manual.md
index 021ae34d..1632e11b 100644
--- a/src/zh/UserGuide/Master/Reference/Common-Config-Manual.md
+++ b/src/zh/UserGuide/Master/Reference/Common-Config-Manual.md
@@ -859,6 +859,16 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
| 默认值 | true |
| 改后生效方式 | 热加载 |
+* enable\_auto\_repair\_compaction
+
+| 名字 | enable\_auto\_repair\_compaction |
+| :----------: |:---------------------------------|
+| 描述 | 修复文件的合并任务 |
+| 类型 | Boolean |
+| 默认值 | true |
+| 改后生效方式 | 热加载 |
+
+
* cross\_selector
|名字| cross\_selector |
@@ -879,12 +889,14 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
* inner\_seq\_selector
-|名字| inner\_seq\_selector |
-|:---:|:---------------------|
-|描述| 顺序空间内合并任务选择器的类型 |
-|类型| String |
-|默认值| size\_tiered |
-|改后生效方式| 重启生效 |
+
+|名字| inner\_seq\_selector
|
+|:---:|:----------------------------------------------------------------------------|
+|描述| 顺序空间内合并任务选择器的类型,可选
size\_tiered\_single_\target,size\_tiered\_multi\_target |
+|类型| String
|
+|默认值| size\_tiered\_multi\_target
|
+|改后生效方式| 热加载
|
+
* inner\_seq\_performer
@@ -897,12 +909,13 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
* inner\_unseq\_selector
-|名字| inner\_unseq\_selector |
-|:---:|:-----------------------|
-|描述| 乱序空间内合并任务选择器的类型 |
-|类型| String |
-|默认值| size\_tiered |
-|改后生效方式| 重启生效 |
+|名字| inner\_unseq\_selector
|
+|:---:|:----------------------------------------------------------------------------|
+|描述| 乱序空间内合并任务选择器的类型,可选
size\_tiered\_single_\target,size\_tiered\_multi\_target |
+|类型| String
|
+|默认值| size\_tiered\_multi\_target
|
+|改后生效方式| 热加载
|
+
* inner\_unseq\_performer
@@ -915,12 +928,13 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
* compaction\_priority
-| 名字 | compaction\_priority
|
-| :----------: |
:-------------------------------------------------------------------------------------------------------------------------------------------------
|
+| 名字 | compaction\_priority
|
+| :----------:
|:------------------------------------------------------------------------------------------|
| 描述 | 合并时的优先级，BALANCE 各种合并平等，INNER_CROSS
优先进行顺序文件和顺序文件或乱序文件和乱序文件的合并，CROSS_INNER 优先将乱序文件合并到顺序文件中 |
-| 类型 | String
|
-| 默认值 | BALANCE
|
-| 改后生效方式 | 重启生效
|
+| 类型 | String
|
+| 默认值 | INNER_CROSS
|
+| 改后生效方式 | 重启服务生效
|
+
* target\_compaction\_file\_size
@@ -967,15 +981,51 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
|默认值| 1000 |
|改后生效方式| 重启生效 |
-* max\_inner\_compaction\_candidate\_file\_num
+* inner\_compaction\_total\_file\_num\_threshold
-|名字| max\_inner\_compaction\_candidate\_file\_num |
+|名字| inner\_compaction\_total\_file\_num\_threshold |
|:---:|:---|
|描述| 空间内合并中一次合并最多参与的文件数 |
|类型| int32 |
|默认值| 30|
|改后生效方式|重启生效|
+* inner\_compaction\_total\_file\_size\_threshold
+
+|名字| inner\_compaction\_total\_file\_size\_threshold |
+|:---:|:------------------------------------------------|
+|描述| 空间内合并任务最大选中文件总大小，单位：byte |
+|类型| int64 |
+|默认值| 10737418240 |
+|改后生效方式| 热加载 |
+
+* compaction\_max\_aligned\_series\_num\_in\_one\_batch
+
+|名字| compaction\_max\_aligned\_series\_num\_in\_one\_batch |
+|:---:|:------------------------------------------------------|
+|描述| 对齐序列合并一次执行时处理的值列数量 |
+|类型| int32 |
+|默认值| 10 |
+|改后生效方式| 热加载 |
+
+* max\_level\_gap\_in\_inner\_compaction
+
+|名字| max\_level\_gap\_in\_inner\_compaction |
+|:---:|:---------------------------------------|
+|描述| 空间内合并选文件时最大允许跨的文件层级 |
+|类型| int32 |
+|默认值| 2 |
+|改后生效方式| 热加载 |
+
+* inner\_compaction\_candidate\_file\_num
+
+|名字| inner\_compaction\_candidate\_file\_num |
+|:---:|:----------------------------------------|
+|描述| 符合构成一个空间内合并任务的候选文件数量 |
+|类型| int32 |
+|默认值| 30 |
+|改后生效方式| 热加载 |
+
* max\_cross\_compaction\_candidate\_file\_num
|名字| max\_cross\_compaction\_candidate\_file\_num |
@@ -983,7 +1033,8 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
|描述| 跨空间合并中一次合并最多参与的文件数 |
|类型| int32 |
|默认值| 500 |
-|改后生效方式| 重启生效 |
+|改后生效方式| 热加载 |
+
* max\_cross\_compaction\_candidate\_file\_size
@@ -991,17 +1042,9 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
|:---:|:----------------------------------------------|
|描述| 跨空间合并中一次合并最多参与的文件总大小 |
|类型| Int64 |
-|默认值| 5368709120 |
-|改后生效方式| 重启生效 |
+|默认值| 5368709120 |
+|改后生效方式| 热加载 |
-* cross\_compaction\_file\_selection\_time\_budget
-
-|名字| cross\_compaction\_file\_selection\_time\_budget |
-|:---:|:---|
-|描述| 若一个合并文件选择运行的时间超过这个时间，它将结束，并且当前的文件合并选择将用作为最终选择。当时间小于0 时，则表示时间是无边界的。单位：ms。|
-|类型| int32 |
-|默认值| 30000 |
-|改后生效方式| 重启生效|
* compaction\_thread\_count
@@ -1039,6 +1082,24 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
|默认值| 16 |
|改后生效方式| 重启生效|
+* compaction\_read\_throughput\_mb\_per\_sec
+
+| 名字 | compaction\_read\_throughput\_mb\_per\_sec |
+|:---------:|:-------------------------------------------|
+| 描述 | 合并每秒读吞吐限制，单位为 byte，设置为 0 代表不限制 |
+| 类型 | int32 |
+| 默认值 | 0 |
+| Effective | 热加载 |
+
+* compaction\_read\_operation\_per\_sec
+
+| 名字 | compaction\_read\_operation\_per\_sec |
+|:---------:|:--------------------------------------|
+| 描述 | 合并每秒读操作数量限制，设置为 0 代表不限制 |
+| 类型 | int32 |
+| 默认值 | 0 |
+| Effective | 热加载 |
+
* sub\_compaction\_thread\_count
|名字| sub\_compaction\_thread\_count |
@@ -1048,15 +1109,14 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
|默认值| 4 |
|改后生效方式| 热加载 |
-* compaction\_validation\_level
-
-|名字| compaction\_validation\_level
|
-|:---:|:----------------------------------------------------------------------------------------------|
-|描述|
合并结束后对顺序文件时间范围的检查,NONE关闭检查，RESOURCE_ONLY检查resource文件，RESOURCE_AND_TSFILE检查resource文件和tsfile文件
|
-|类型| String
|
-|默认值| NONE
|
-|改后生效方式| 热加载
|
+* enable\_tsfile\_validation
+| 名字 | enable\_tsfile\_validation |
+|:---------:|:------------------------------|
+| 描述 | Flush, Load 或合并后验证 tsfile 正确性 |
+| 类型 | boolean |
+| 默认值 | false |
+| 改后生效方式 | 热加载 |
* candidate\_compaction\_task\_queue\_size
diff --git a/src/zh/UserGuide/latest/Reference/Common-Config-Manual.md
b/src/zh/UserGuide/latest/Reference/Common-Config-Manual.md
index 342ca979..75f58c34 100644
--- a/src/zh/UserGuide/latest/Reference/Common-Config-Manual.md
+++ b/src/zh/UserGuide/latest/Reference/Common-Config-Manual.md
@@ -906,12 +906,13 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
* compaction\_priority
-| 名字 | compaction\_priority
|
-| :----------: |
:-------------------------------------------------------------------------------------------------------------------------------------------------
|
+| 名字 | compaction\_priority
|
+| :----------:
|:------------------------------------------------------------------------------------------|
| 描述 | 合并时的优先级，BALANCE 各种合并平等，INNER_CROSS
优先进行顺序文件和顺序文件或乱序文件和乱序文件的合并，CROSS_INNER 优先将乱序文件合并到顺序文件中 |
-| 类型 | String
|
-| 默认值 | BALANCE
|
-| 改后生效方式 | 重启生效
|
+| 类型 | String
|
+| 默认值 | INNER_CROSS
|
+| 改后生效方式 | 重启服务生效
|
+
* target\_compaction\_file\_size
@@ -920,7 +921,8 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
| 描述 | 合并后的目标文件大小 |
| 类型 | Int64 |
| 默认值 | 2147483648 |
-| 改后生效方式 | 重启生效 |
+| 改后生效方式 | 热加载生效 |
+
* target\_chunk\_size
@@ -965,7 +967,8 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
|描述| 空间内合并中一次合并最多参与的文件数 |
|类型| int32 |
|默认值| 30|
-|改后生效方式|重启生效|
+|改后生效方式|热加载生效|
+
* max\_cross\_compaction\_candidate\_file\_num
@@ -974,7 +977,8 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
|描述| 跨空间合并中一次合并最多参与的文件数 |
|类型| int32 |
|默认值| 500 |
-|改后生效方式| 重启生效 |
+|改后生效方式| 热加载生效 |
+
* max\_cross\_compaction\_candidate\_file\_size
@@ -983,16 +987,8 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
|描述| 跨空间合并中一次合并最多参与的文件总大小 |
|类型| Int64 |
|默认值| 5368709120 |
-|改后生效方式| 重启生效 |
-
-* cross\_compaction\_file\_selection\_time\_budget
+|改后生效方式| 热加载生效 |
-|名字| cross\_compaction\_file\_selection\_time\_budget |
-|:---:|:---|
-|描述| 若一个合并文件选择运行的时间超过这个时间，它将结束，并且当前的文件合并选择将用作为最终选择。当时间小于0 时，则表示时间是无边界的。单位：ms。|
-|类型| int32 |
-|默认值| 30000 |
-|改后生效方式| 重启生效|
* compaction\_thread\_count
@@ -1012,23 +1008,34 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
| 默认值 | 60000 |
| 改后生效方式 | 重启生效 |
-* compaction\_submission\_interval\_in\_ms
-
-| 名字 | compaction\_submission\_interval\_in\_ms |
-| :----------: | :--------------------------------------- |
-| 描述 | 合并任务提交的间隔 |
-| 类型 | Int64 |
-| 默认值 | 60000 |
-| 改后生效方式 | 重启生效 |
* compaction\_write\_throughput\_mb\_per\_sec
|名字| compaction\_write\_throughput\_mb\_per\_sec |
-|:---:|:---|
-|描述| 每秒可达到的写入吞吐量合并限制。|
-|类型| int32 |
-|默认值| 16 |
-|改后生效方式| 重启生效|
+|:---:|:--------------------------------------------|
+|描述| 每秒可达到的写入吞吐量合并限制。 |
+|类型| int32 |
+|默认值| 16 |
+|改后生效方式| 热加载生效 |
+
+* compaction\_read\_throughput\_mb\_per\_sec
+
+| 名字 | compaction\_read\_throughput\_mb\_per\_sec |
+|:---------:|:-------------------------------------------|
+| 描述 | 合并每秒读吞吐限制，单位为 byte，设置为 0 代表不限制 |
+| 类型 | int32 |
+| 默认值 | 0 |
+| Effective | 热加载 |
+
+* compaction\_read\_operation\_per\_sec
+
+| 名字 | compaction\_read\_operation\_per\_sec |
+|:---------:|:--------------------------------------|
+| 描述 | 合并每秒读操作数量限制，设置为 0 代表不限制 |
+| 类型 | int32 |
+| 默认值 | 0 |
+| 改后生效方式 | 热加载 |
+
* sub\_compaction\_thread\_count
@@ -1039,15 +1046,14 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。
|默认值| 4 |
|改后生效方式| 热加载 |
-* compaction\_validation\_level
-
-|名字| compaction\_validation\_level
|
-|:---:|:----------------------------------------------------------------------------------------------|
-|描述|
合并结束后对顺序文件时间范围的检查,NONE关闭检查，RESOURCE_ONLY检查resource文件，RESOURCE_AND_TSFILE检查resource文件和tsfile文件
|
-|类型| String
|
-|默认值| NONE
|
-|改后生效方式| 热加载
|
+* enable\_tsfile\_validation
+| 名字 | enable\_tsfile\_validation |
+|:---------:|:------------------------------|
+| 描述 | Flush, Load 或合并后验证 tsfile 正确性 |
+| 类型 | boolean |
+| 默认值 | false |
+| 改后生效方式 | 热加载 |
* candidate\_compaction\_task\_queue\_size
