From 1aa2b3a4cd014bedcce02fed55358fa3ea1ceafd Mon Sep 17 00:00:00 2001 From: chasingegg Date: Mon, 5 Apr 2021 00:16:35 +0800 Subject: [PATCH 1/3] fix trace type --- docs/en/operations/system-tables/trace_log.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/en/operations/system-tables/trace_log.md b/docs/en/operations/system-tables/trace_log.md index b3b04795a60..d807285f9b0 100644 --- a/docs/en/operations/system-tables/trace_log.md +++ b/docs/en/operations/system-tables/trace_log.md @@ -20,10 +20,12 @@ Columns: When connecting to the server by `clickhouse-client`, you see the string similar to `Connected to ClickHouse server version 19.18.1 revision 54429.`. This field contains the `revision`, but not the `version` of a server. -- `timer_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Timer type: +- `trace_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Trace type: - - `Real` represents wall-clock time. - - `CPU` represents CPU time. + - `Real` represents collecting stack traces by wall-clock time. + - `CPU` represents collecting stack traces by CPU time. + - `Memory` represents collecting allocations and deallocations + - `MemorySample` represents collecting random allocations and deallocations - `thread_number` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Thread identifier. From c1556e4d8e4b88761bc8073003272724c7716070 Mon Sep 17 00:00:00 2001 From: chasingegg Date: Mon, 5 Apr 2021 00:17:42 +0800 Subject: [PATCH 2/3] tiny fix --- docs/en/operations/system-tables/trace_log.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/operations/system-tables/trace_log.md b/docs/en/operations/system-tables/trace_log.md index d807285f9b0..9250a9e6be0 100644 --- a/docs/en/operations/system-tables/trace_log.md +++ b/docs/en/operations/system-tables/trace_log.md @@ -24,8 +24,8 @@ Columns: - `Real` represents collecting stack traces by wall-clock time. - `CPU` represents collecting stack traces by CPU time. - - `Memory` represents collecting allocations and deallocations - - `MemorySample` represents collecting random allocations and deallocations + - `Memory` represents collecting allocations and deallocations. + - `MemorySample` represents collecting random allocations and deallocations. - `thread_number` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Thread identifier. From af9d5440bd5e7aeef83c8e812bb262e0f7844a4c Mon Sep 17 00:00:00 2001 From: alexey-milovidov Date: Mon, 5 Apr 2021 00:18:48 +0300 Subject: [PATCH 3/3] Update trace_log.md --- docs/en/operations/system-tables/trace_log.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/operations/system-tables/trace_log.md b/docs/en/operations/system-tables/trace_log.md index 9250a9e6be0..e4c01a65d9d 100644 --- a/docs/en/operations/system-tables/trace_log.md +++ b/docs/en/operations/system-tables/trace_log.md @@ -24,7 +24,7 @@ Columns: - `Real` represents collecting stack traces by wall-clock time. - `CPU` represents collecting stack traces by CPU time. - - `Memory` represents collecting allocations and deallocations. + - `Memory` represents collecting allocations and deallocations when memory allocation exceeds the subsequent watermark. - `MemorySample` represents collecting random allocations and deallocations. - `thread_number` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Thread identifier.