From 4f3ff67cf49245dcfe90483376beb1b6619cfd64 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 25 Nov 2021 13:59:03 +0800 Subject: [PATCH 1/2] Align 3 PR from docs-cn --- configure-memory-usage.md | 2 +- sql-plan-replayer.md | 6 +++++- tidb-configuration-file.md | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure-memory-usage.md b/configure-memory-usage.md index c754c221b270b..cab9f79a53a10 100644 --- a/configure-memory-usage.md +++ b/configure-memory-usage.md @@ -100,7 +100,7 @@ The following example constructs a memory-intensive SQL statement that triggers 2. Execute `CREATE TABLE t(a int);` and insert 1000 rows of data. -3. Execute `select * from t t1 join t t1 join t t3 order by t1.a`. This SQL statement outputs one billion records, which consumes a large amount of memory and therefore triggers the alarm. +3. Execute `select * from t t1 join t t2 join t t3 order by t1.a`. This SQL statement outputs one billion records, which consumes a large amount of memory and therefore triggers the alarm. 4. Check the `tidb.log` file which records the total system memory, current system memory usage, memory usage of the tidb-server instance, and the directory of status files. diff --git a/sql-plan-replayer.md b/sql-plan-replayer.md index f670f8c762ce3..43daf8954db92 100644 --- a/sql-plan-replayer.md +++ b/sql-plan-replayer.md @@ -49,7 +49,11 @@ analyze table t; plan replayer dump explain select * from t; ``` -`PLAN REPLAYER DUMP` packages the table information above into a `ZIP` file and returns the file identifier as the execution result. +`PLAN REPLAYER DUMP` packages the table information above into a `ZIP` file and returns the file identifier as the execution result. This file is a one-time file. After the file is downloaded, TiDB will delete it. + +> **note:** +> +> The `ZIP` file is stored in a TiDB cluster for at most one hour. After one hour, TiDB will delete it. ```sql MySQL [test]> plan replayer dump explain select * from t; diff --git a/tidb-configuration-file.md b/tidb-configuration-file.md index 6350a8435a171..56eac73bf104d 100644 --- a/tidb-configuration-file.md +++ b/tidb-configuration-file.md @@ -255,7 +255,8 @@ Configuration items related to log files. #### `max-size` - The size limit of the log file. -- Default value: 300MB +- Default value: 300 +- Unit: MB - The maximum size is 4GB. #### `max-days` From dc6f53232e1f2794023ab3b96e86c7d7b90bbae5 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 25 Nov 2021 15:12:10 +0800 Subject: [PATCH 2/2] Update sql-plan-replayer.md Co-authored-by: Liuxiaozhen12 <82579298+Liuxiaozhen12@users.noreply.github.com> --- sql-plan-replayer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-plan-replayer.md b/sql-plan-replayer.md index 43daf8954db92..15ea8c7627bdb 100644 --- a/sql-plan-replayer.md +++ b/sql-plan-replayer.md @@ -51,7 +51,7 @@ plan replayer dump explain select * from t; `PLAN REPLAYER DUMP` packages the table information above into a `ZIP` file and returns the file identifier as the execution result. This file is a one-time file. After the file is downloaded, TiDB will delete it. -> **note:** +> **Note:** > > The `ZIP` file is stored in a TiDB cluster for at most one hour. After one hour, TiDB will delete it.