From e6d8f023d790e27bfd69a358582179279000717c Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Wed, 20 Dec 2023 12:01:53 +0900 Subject: [PATCH 1/3] This is an automated cherry-pick of #15168 Signed-off-by: ti-chi-bot --- system-variables.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/system-variables.md b/system-variables.md index 242d5b56ad6bb..e418608f06ebe 100644 --- a/system-variables.md +++ b/system-variables.md @@ -2047,6 +2047,31 @@ For a system upgraded to v5.0 from an earlier version, if you have not modified - Range: `[100, 16384]` - This variable is used to set the maximum number of schema versions (the table IDs modified for corresponding versions) allowed to be cached. The value range is 100 ~ 16384. +<<<<<<< HEAD +======= +### tidb_max_paging_size New in v6.3.0 + +- Scope: SESSION | GLOBAL +- Persists to cluster: Yes +- Applies to hint [SET_VAR](/optimizer-hints.md#set_varvar_namevar_value): Yes +- Type: Integer +- Default value: `50000` +- Range: `[1, 9223372036854775807]` +- Unit: Rows +- This variable is used to set the maximum number of rows during the coprocessor paging request process. Setting it to too small a value increases the RPC count between TiDB and TiKV, while setting it to too large a value results in excessive memory usage in some cases, such as loading data and full table scan. The default value of this variable brings better performance in OLTP scenarios than in OLAP scenarios. If the application only uses TiKV as the storage engine, consider increasing the value of this variable when executing OLAP workload queries, which might bring you better performance. + +### tidb_max_tiflash_threads New in v6.1.0 + +- Scope: SESSION | GLOBAL +- Persists to cluster: Yes +- Applies to hint [SET_VAR](/optimizer-hints.md#set_varvar_namevar_value): No +- Type: Integer +- Default value: `-1` +- Range: `[-1, 256]` +- Unit: Threads +- This variable is used to set the maximum concurrency for TiFlash to execute a request. The default value is `-1`, indicating that this system variable is invalid and the maximum concurrency depends on the setting of the TiFlash configuration `profiles.default.max_threads`. When the value is `0`, the maximum number of threads is automatically configured by TiFlash. + +>>>>>>> ba55227390 (Explain `tidb_max_tiflash_threads` default value `-1` means (#15168)) ### tidb_mem_oom_action New in v6.1.0 - Scope: GLOBAL From 4332b5b84a28255cecb48bd50cdc66243c130228 Mon Sep 17 00:00:00 2001 From: Aolin Date: Wed, 20 Dec 2023 13:43:41 +0800 Subject: [PATCH 2/3] resolve conflicts --- system-variables.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/system-variables.md b/system-variables.md index e418608f06ebe..95e3c7c7cbe27 100644 --- a/system-variables.md +++ b/system-variables.md @@ -2047,19 +2047,6 @@ For a system upgraded to v5.0 from an earlier version, if you have not modified - Range: `[100, 16384]` - This variable is used to set the maximum number of schema versions (the table IDs modified for corresponding versions) allowed to be cached. The value range is 100 ~ 16384. -<<<<<<< HEAD -======= -### tidb_max_paging_size New in v6.3.0 - -- Scope: SESSION | GLOBAL -- Persists to cluster: Yes -- Applies to hint [SET_VAR](/optimizer-hints.md#set_varvar_namevar_value): Yes -- Type: Integer -- Default value: `50000` -- Range: `[1, 9223372036854775807]` -- Unit: Rows -- This variable is used to set the maximum number of rows during the coprocessor paging request process. Setting it to too small a value increases the RPC count between TiDB and TiKV, while setting it to too large a value results in excessive memory usage in some cases, such as loading data and full table scan. The default value of this variable brings better performance in OLTP scenarios than in OLAP scenarios. If the application only uses TiKV as the storage engine, consider increasing the value of this variable when executing OLAP workload queries, which might bring you better performance. - ### tidb_max_tiflash_threads New in v6.1.0 - Scope: SESSION | GLOBAL @@ -2071,7 +2058,6 @@ For a system upgraded to v5.0 from an earlier version, if you have not modified - Unit: Threads - This variable is used to set the maximum concurrency for TiFlash to execute a request. The default value is `-1`, indicating that this system variable is invalid and the maximum concurrency depends on the setting of the TiFlash configuration `profiles.default.max_threads`. When the value is `0`, the maximum number of threads is automatically configured by TiFlash. ->>>>>>> ba55227390 (Explain `tidb_max_tiflash_threads` default value `-1` means (#15168)) ### tidb_mem_oom_action New in v6.1.0 - Scope: GLOBAL From dd444fb5ac10cf2cb4ee989a9de49afa57f17173 Mon Sep 17 00:00:00 2001 From: Aolin Date: Wed, 20 Dec 2023 13:44:48 +0800 Subject: [PATCH 3/3] resolve conflicts --- system-variables.md | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/system-variables.md b/system-variables.md index 95e3c7c7cbe27..4903aae892160 100644 --- a/system-variables.md +++ b/system-variables.md @@ -2047,17 +2047,6 @@ For a system upgraded to v5.0 from an earlier version, if you have not modified - Range: `[100, 16384]` - This variable is used to set the maximum number of schema versions (the table IDs modified for corresponding versions) allowed to be cached. The value range is 100 ~ 16384. -### tidb_max_tiflash_threads New in v6.1.0 - -- Scope: SESSION | GLOBAL -- Persists to cluster: Yes -- Applies to hint [SET_VAR](/optimizer-hints.md#set_varvar_namevar_value): No -- Type: Integer -- Default value: `-1` -- Range: `[-1, 256]` -- Unit: Threads -- This variable is used to set the maximum concurrency for TiFlash to execute a request. The default value is `-1`, indicating that this system variable is invalid and the maximum concurrency depends on the setting of the TiFlash configuration `profiles.default.max_threads`. When the value is `0`, the maximum number of threads is automatically configured by TiFlash. - ### tidb_mem_oom_action New in v6.1.0 - Scope: GLOBAL @@ -2881,7 +2870,7 @@ Query OK, 0 rows affected, 1 warning (0.00 sec) - Persists to cluster: Yes - Default value: `-1` - Range: `[-1, 256]` -- This variable is used to set the maximum concurrency for TiFlash to execute a request. The default value is `-1`, indicating that this system variable is invalid. When the value is `0`, the maximum number of threads is automatically configured by TiFlash. +- This variable is used to set the maximum concurrency for TiFlash to execute a request. The default value is `-1`, indicating that this system variable is invalid and the maximum concurrency depends on the setting of the TiFlash configuration `profiles.default.max_threads`. When the value is `0`, the maximum number of threads is automatically configured by TiFlash. ### tidb_mpp_store_fail_ttl