From 967ffe5d970924edc0fa5ea5346350eca9e2a122 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Fri, 23 Jul 2021 15:14:14 +0800 Subject: [PATCH 1/3] This is an automated cherry-pick of #6021 Signed-off-by: ti-chi-bot --- sql-statements/sql-statement-show-variables.md | 2 +- statement-summary-tables.md | 2 +- system-variables.md | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sql-statements/sql-statement-show-variables.md b/sql-statements/sql-statement-show-variables.md index 8aeab8afe8ebb..c2ac1ab154476 100644 --- a/sql-statements/sql-statement-show-variables.md +++ b/sql-statements/sql-statement-show-variables.md @@ -129,7 +129,7 @@ mysql> SHOW GLOBAL VARIABLES LIKE 'tidb%'; | tidb_stmt_summary_history_size | 24 | | tidb_stmt_summary_internal_query | 0 | | tidb_stmt_summary_max_sql_length | 4096 | -| tidb_stmt_summary_max_stmt_count | 200 | +| tidb_stmt_summary_max_stmt_count | 3000 | | tidb_stmt_summary_refresh_interval | 1800 | | tidb_store_limit | 0 | | tidb_txn_mode | | diff --git a/statement-summary-tables.md b/statement-summary-tables.md index 167c1c79ebb8c..2ee6b5b8b8417 100644 --- a/statement-summary-tables.md +++ b/statement-summary-tables.md @@ -101,7 +101,7 @@ The following system variables are used to control the statement summary: - `tidb_enable_stmt_summary`: Determines whether to enable the statement summary feature. `1` represents `enable`, and `0` means `disable`. The feature is enabled by default. The statistics in the system table are cleared if this feature is disabled. The statistics are re-calculated next time this feature is enabled. Tests have shown that enabling this feature has little impact on performance. - `tidb_stmt_summary_refresh_interval`: The interval at which the `statements_summary` table is refreshed. The time unit is second (s). The default value is `1800`. - `tidb_stmt_summary_history_size`: The size of each SQL statement category stored in the `statements_summary_history` table. The default value is `24`. -- `tidb_stmt_summary_max_stmt_count`: Limits the number of SQL statements that can be stored in statement summary tables. The default value is `200`. If the limit is exceeded, those SQL statements that recently remain unused are cleared. +- `tidb_stmt_summary_max_stmt_count`: Limits the number of SQL statements that can be stored in statement summary tables. Before v4.0.14, the default value is `200`. Since v4.0.14, the default value is `3000`. If the limit is exceeded, those SQL statements that recently remain unused are cleared. - `tidb_stmt_summary_max_sql_length`: Specifies the longest display length of `DIGEST_TEXT` and `QUERY_SAMPLE_TEXT`. The default value is `4096`. - `tidb_stmt_summary_internal_query`: Determines whether to count the TiDB SQL statements. `1` means to count, and `0` means not to count. The default value is `0`. diff --git a/system-variables.md b/system-variables.md index 4a7df731d502d..57519150e53b3 100644 --- a/system-variables.md +++ b/system-variables.md @@ -1204,8 +1204,12 @@ SET tidb_slow_log_threshold = 200; ### tidb_stmt_summary_max_stmt_count New in v4.0 - Scope: SESSION | GLOBAL +<<<<<<< HEAD - Default value: `200` - Range: `[1, 32767]` +======= +- Default value: Before v4.0.14, the default value is 200. Since v4.0.14, the default value is 3000 (the value of the default configuration file). +>>>>>>> 53b1093d6 (Update the default value of tidb_stmt_summary_max_stmt_count (#6021)) - This variable is used to set the maximum number of statements that the statement summary stores in memory. ### tidb_stmt_summary_refresh_interval New in v4.0 From 46965e5536d8ba3f4e0c75d54402e935d4676753 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Mon, 27 Sep 2021 13:11:32 +0800 Subject: [PATCH 2/3] Update statement-summary-tables.md --- statement-summary-tables.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/statement-summary-tables.md b/statement-summary-tables.md index 2ee6b5b8b8417..2ead31d934ff2 100644 --- a/statement-summary-tables.md +++ b/statement-summary-tables.md @@ -101,7 +101,7 @@ The following system variables are used to control the statement summary: - `tidb_enable_stmt_summary`: Determines whether to enable the statement summary feature. `1` represents `enable`, and `0` means `disable`. The feature is enabled by default. The statistics in the system table are cleared if this feature is disabled. The statistics are re-calculated next time this feature is enabled. Tests have shown that enabling this feature has little impact on performance. - `tidb_stmt_summary_refresh_interval`: The interval at which the `statements_summary` table is refreshed. The time unit is second (s). The default value is `1800`. - `tidb_stmt_summary_history_size`: The size of each SQL statement category stored in the `statements_summary_history` table. The default value is `24`. -- `tidb_stmt_summary_max_stmt_count`: Limits the number of SQL statements that can be stored in statement summary tables. Before v4.0.14, the default value is `200`. Since v4.0.14, the default value is `3000`. If the limit is exceeded, those SQL statements that recently remain unused are cleared. +- `tidb_stmt_summary_max_stmt_count`: Limits the number of SQL statements that can be stored in statement summary tables. Before v5.0.4, the default value is `200`. Since v5.0.4, the default value is `3000`. If the limit is exceeded, those SQL statements that recently remain unused are cleared. - `tidb_stmt_summary_max_sql_length`: Specifies the longest display length of `DIGEST_TEXT` and `QUERY_SAMPLE_TEXT`. The default value is `4096`. - `tidb_stmt_summary_internal_query`: Determines whether to count the TiDB SQL statements. `1` means to count, and `0` means not to count. The default value is `0`. From beab2d2fc9b0d46081b6b5ab2f0e909124d1876d Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Mon, 27 Sep 2021 13:12:24 +0800 Subject: [PATCH 3/3] Update system-variables.md --- system-variables.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/system-variables.md b/system-variables.md index 57519150e53b3..99f06a139d9dd 100644 --- a/system-variables.md +++ b/system-variables.md @@ -1204,12 +1204,8 @@ SET tidb_slow_log_threshold = 200; ### tidb_stmt_summary_max_stmt_count New in v4.0 - Scope: SESSION | GLOBAL -<<<<<<< HEAD -- Default value: `200` +- Default value: Before v5.0.4, the default value is `200`. Since v5.0.4, the default value is `3000`. - Range: `[1, 32767]` -======= -- Default value: Before v4.0.14, the default value is 200. Since v4.0.14, the default value is 3000 (the value of the default configuration file). ->>>>>>> 53b1093d6 (Update the default value of tidb_stmt_summary_max_stmt_count (#6021)) - This variable is used to set the maximum number of statements that the statement summary stores in memory. ### tidb_stmt_summary_refresh_interval New in v4.0