From 7409002ce0dfd21e9d495aa6fe6756dfd9fc6264 Mon Sep 17 00:00:00 2001 From: andrei-karpliuk Date: Fri, 1 Nov 2019 11:45:09 +0300 Subject: [PATCH 1/8] added brief description for queries system stop|start merges --- docs/en/query_language/system.md | 17 +++++++++++++++++ docs/ru/query_language/system.md | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/docs/en/query_language/system.md b/docs/en/query_language/system.md index 3ef504e46b3..4eec49d23ca 100644 --- a/docs/en/query_language/system.md +++ b/docs/en/query_language/system.md @@ -11,6 +11,7 @@ - [STOP DISTRIBUTED SENDS](#query_language-system-stop-distributed-sends) - [FLUSH DISTRIBUTED](#query_language-system-flush-distributed) - [START DISTRIBUTED SENDS](#query_language-system-start-distributed-sends) +- [STOP|START MERGES](#query_language-system-stop-start-merges) ## RELOAD DICTIONARIES {#query_language-system-reload-dictionaries} @@ -85,4 +86,20 @@ Enables background data distribution when inserting data into distributed tables SYSTEM START DISTRIBUTED SENDS [db.] ``` + +### STOP|START MERGES {#query_language-system-stop-start-merges} + +Provides possibility to stop and start background merges for all tables in the MergeTree family: + +```sql +SYSTEM STOP|START MERGES +``` + +Optionally we can define specific table: + +```sql +SYSTEM STOP|START MERGES [db.] +``` +NOTE: DETACH / ATTACH table will start background merges even in case we stopped merges for all *MergeTree tables before). + [Original article](https://clickhouse.yandex/docs/en/query_language/system/) diff --git a/docs/ru/query_language/system.md b/docs/ru/query_language/system.md index 474574b0b19..af6bf5b1b72 100644 --- a/docs/ru/query_language/system.md +++ b/docs/ru/query_language/system.md @@ -11,6 +11,7 @@ - [STOP DISTRIBUTED SENDS](#query_language-system-stop-distributed-sends) - [FLUSH DISTRIBUTED](#query_language-system-flush-distributed) - [START DISTRIBUTED SENDS](#query_language-system-start-distributed-sends) +- [STOP|START MERGES](#query_language-system-stop-start-merges) ## RELOAD DICTIONARIES {#query_language-system-reload-dictionaries} @@ -82,5 +83,21 @@ SYSTEM FLUSH DISTRIBUTED [db.] SYSTEM START DISTRIBUTED SENDS [db.] ``` +### STOP|START MERGES {#query_language-system-stop-start-merges} + +Позволяет отключать и включать фоновые мержи для всех таблиц семейства *MergeTree: + +```sql +SYSTEM STOP|START MERGES +``` + +Также можно указать определенную таблицу: + +```sql +SYSTEM STOP|START MERGES [db.] +``` +NOTE: DETACH / ATTACH таблицы восстанавливает фоновые мержи для этой +таблицы (даже в случае отключения фоновых мержей для всех таблиц семейства *MergeTree). + [Оригинальная статья](https://clickhouse.yandex/docs/ru/query_language/system/) From 3b0f41f71b82dbb614e23b6806455efda026dfca Mon Sep 17 00:00:00 2001 From: andrei-karpliuk Date: Fri, 1 Nov 2019 13:28:39 +0300 Subject: [PATCH 2/8] clarified --- docs/en/query_language/system.md | 2 +- docs/ru/query_language/system.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/query_language/system.md b/docs/en/query_language/system.md index 4eec49d23ca..f897a764348 100644 --- a/docs/en/query_language/system.md +++ b/docs/en/query_language/system.md @@ -100,6 +100,6 @@ Optionally we can define specific table: ```sql SYSTEM STOP|START MERGES [db.] ``` -NOTE: DETACH / ATTACH table will start background merges even in case we stopped merges for all *MergeTree tables before). +NOTE: DETACH / ATTACH table will start background merges for the table even in case we stopped merges for all *MergeTree tables before). [Original article](https://clickhouse.yandex/docs/en/query_language/system/) diff --git a/docs/ru/query_language/system.md b/docs/ru/query_language/system.md index af6bf5b1b72..cdaaca798d4 100644 --- a/docs/ru/query_language/system.md +++ b/docs/ru/query_language/system.md @@ -97,7 +97,7 @@ SYSTEM STOP|START MERGES SYSTEM STOP|START MERGES [db.] ``` NOTE: DETACH / ATTACH таблицы восстанавливает фоновые мержи для этой -таблицы (даже в случае отключения фоновых мержей для всех таблиц семейства *MergeTree). +таблицы (даже в случае отключения фоновых мержей для всех таблиц семейства *MergeTree до DETACH ). [Оригинальная статья](https://clickhouse.yandex/docs/ru/query_language/system/) From 8203569fdf2fea393bde99968f272f7030a7090b Mon Sep 17 00:00:00 2001 From: andrei-karpliuk <45938185+andrei-karpliuk@users.noreply.github.com> Date: Fri, 1 Nov 2019 16:27:26 +0300 Subject: [PATCH 3/8] Update docs/en/query_language/system.md Co-Authored-By: Ivan Blinkov --- docs/en/query_language/system.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/en/query_language/system.md b/docs/en/query_language/system.md index f897a764348..d492d58912b 100644 --- a/docs/en/query_language/system.md +++ b/docs/en/query_language/system.md @@ -100,6 +100,7 @@ Optionally we can define specific table: ```sql SYSTEM STOP|START MERGES [db.] ``` -NOTE: DETACH / ATTACH table will start background merges for the table even in case we stopped merges for all *MergeTree tables before). +!!! note "Note": + `DETACH / ATTACH` table will start background merges for the table even in case when merges have been stopped for all *MergeTree tables before. [Original article](https://clickhouse.yandex/docs/en/query_language/system/) From c655e939c49ea26a2a21950bb145b3e67d75a914 Mon Sep 17 00:00:00 2001 From: andrei-karpliuk Date: Fri, 1 Nov 2019 17:17:49 +0300 Subject: [PATCH 4/8] separated stop and start commands --- docs/en/query_language/system.md | 24 ++++++++++++++---------- docs/ru/query_language/system.md | 20 ++++++++++++-------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/docs/en/query_language/system.md b/docs/en/query_language/system.md index d492d58912b..655e7682c81 100644 --- a/docs/en/query_language/system.md +++ b/docs/en/query_language/system.md @@ -11,7 +11,8 @@ - [STOP DISTRIBUTED SENDS](#query_language-system-stop-distributed-sends) - [FLUSH DISTRIBUTED](#query_language-system-flush-distributed) - [START DISTRIBUTED SENDS](#query_language-system-start-distributed-sends) -- [STOP|START MERGES](#query_language-system-stop-start-merges) +- [STOP MERGES](#query_language-system-stop-merges) +- [START MERGES](#query_language-system-start-merges) ## RELOAD DICTIONARIES {#query_language-system-reload-dictionaries} @@ -87,20 +88,23 @@ SYSTEM START DISTRIBUTED SENDS [db.] ``` -### STOP|START MERGES {#query_language-system-stop-start-merges} +### STOP MERGES {#query_language-system-stop-merges} -Provides possibility to stop and start background merges for all tables in the MergeTree family: +Provides possibility to stop background merges for tables in the MergeTree family: ```sql -SYSTEM STOP|START MERGES -``` - -Optionally we can define specific table: - -```sql -SYSTEM STOP|START MERGES [db.] +SYSTEM STOP MERGES [[db.]merge_tree_family_table_name] ``` !!! note "Note": `DETACH / ATTACH` table will start background merges for the table even in case when merges have been stopped for all *MergeTree tables before. + +### START MERGES {#query_language-system-start-merges} + +Provides possibility to start background merges for tables in the MergeTree family: + +```sql +SYSTEM START MERGES [[db.]merge_tree_family_table_name] +``` + [Original article](https://clickhouse.yandex/docs/en/query_language/system/) diff --git a/docs/ru/query_language/system.md b/docs/ru/query_language/system.md index cdaaca798d4..6bedad1e55c 100644 --- a/docs/ru/query_language/system.md +++ b/docs/ru/query_language/system.md @@ -11,7 +11,8 @@ - [STOP DISTRIBUTED SENDS](#query_language-system-stop-distributed-sends) - [FLUSH DISTRIBUTED](#query_language-system-flush-distributed) - [START DISTRIBUTED SENDS](#query_language-system-start-distributed-sends) -- [STOP|START MERGES](#query_language-system-stop-start-merges) +- [STOP MERGES](#query_language-system-stop-merges) +- [START MERGES](#query_language-system-start-merges) ## RELOAD DICTIONARIES {#query_language-system-reload-dictionaries} @@ -83,21 +84,24 @@ SYSTEM FLUSH DISTRIBUTED [db.] SYSTEM START DISTRIBUTED SENDS [db.] ``` -### STOP|START MERGES {#query_language-system-stop-start-merges} +### STOP MERGES {#query_language-system-stop-merges} -Позволяет отключать и включать фоновые мержи для всех таблиц семейства *MergeTree: +Позволяет остановить фоновые мержи для таблиц семейства *MergeTree: ```sql -SYSTEM STOP|START MERGES +SYSTEM STOP MERGES [[db.]merge_tree_family_table_name] ``` +!!! note "Note": + `DETACH / ATTACH` таблицы восстанавливает фоновые мержи для этой таблицы (даже в случае отключения фоновых мержей для всех таблиц семейства *MergeTree до `DETACH`). -Также можно указать определенную таблицу: + +### START MERGES {#query_language-system-start-merges} + +Включает фоновые мержи для таблиц семейства *MergeTree: ```sql -SYSTEM STOP|START MERGES [db.] +SYSTEM START MERGES [[db.]merge_tree_family_table_name] ``` -NOTE: DETACH / ATTACH таблицы восстанавливает фоновые мержи для этой -таблицы (даже в случае отключения фоновых мержей для всех таблиц семейства *MergeTree до DETACH ). [Оригинальная статья](https://clickhouse.yandex/docs/ru/query_language/system/) From ea50c51dbaf06ba8c45b07909e2842cff0bf0f91 Mon Sep 17 00:00:00 2001 From: andrei-karpliuk <45938185+andrei-karpliuk@users.noreply.github.com> Date: Fri, 1 Nov 2019 17:27:20 +0300 Subject: [PATCH 5/8] asterisk deleted Co-Authored-By: Ivan Blinkov --- docs/ru/query_language/system.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ru/query_language/system.md b/docs/ru/query_language/system.md index 6bedad1e55c..4509c4473fe 100644 --- a/docs/ru/query_language/system.md +++ b/docs/ru/query_language/system.md @@ -97,7 +97,7 @@ SYSTEM STOP MERGES [[db.]merge_tree_family_table_name] ### START MERGES {#query_language-system-start-merges} -Включает фоновые мержи для таблиц семейства *MergeTree: +Включает фоновые мержи для таблиц семейства MergeTree: ```sql SYSTEM START MERGES [[db.]merge_tree_family_table_name] From d97b815c1347c33e8e4bf545a906a2dbc9cd84ff Mon Sep 17 00:00:00 2001 From: andrei-karpliuk <45938185+andrei-karpliuk@users.noreply.github.com> Date: Fri, 1 Nov 2019 17:27:36 +0300 Subject: [PATCH 6/8] asterisk deleted Co-Authored-By: Ivan Blinkov --- docs/ru/query_language/system.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ru/query_language/system.md b/docs/ru/query_language/system.md index 4509c4473fe..f7801f01b68 100644 --- a/docs/ru/query_language/system.md +++ b/docs/ru/query_language/system.md @@ -92,7 +92,7 @@ SYSTEM START DISTRIBUTED SENDS [db.] SYSTEM STOP MERGES [[db.]merge_tree_family_table_name] ``` !!! note "Note": - `DETACH / ATTACH` таблицы восстанавливает фоновые мержи для этой таблицы (даже в случае отключения фоновых мержей для всех таблиц семейства *MergeTree до `DETACH`). + `DETACH / ATTACH` таблицы восстанавливает фоновые мержи для этой таблицы (даже в случае отключения фоновых мержей для всех таблиц семейства MergeTree до `DETACH`). ### START MERGES {#query_language-system-start-merges} From 17cc3ab9d13a343bbb4619011fc4310243749a46 Mon Sep 17 00:00:00 2001 From: andrei-karpliuk <45938185+andrei-karpliuk@users.noreply.github.com> Date: Fri, 1 Nov 2019 17:27:59 +0300 Subject: [PATCH 7/8] asterisk deleted Co-Authored-By: Ivan Blinkov --- docs/ru/query_language/system.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ru/query_language/system.md b/docs/ru/query_language/system.md index f7801f01b68..7b94dd1eb69 100644 --- a/docs/ru/query_language/system.md +++ b/docs/ru/query_language/system.md @@ -86,7 +86,7 @@ SYSTEM START DISTRIBUTED SENDS [db.] ### STOP MERGES {#query_language-system-stop-merges} -Позволяет остановить фоновые мержи для таблиц семейства *MergeTree: +Позволяет остановить фоновые мержи для таблиц семейства MergeTree: ```sql SYSTEM STOP MERGES [[db.]merge_tree_family_table_name] From 9fae5b60a0206f404d87a121f7f7977e6aa1ed32 Mon Sep 17 00:00:00 2001 From: andrei-karpliuk Date: Fri, 1 Nov 2019 17:31:06 +0300 Subject: [PATCH 8/8] asterisk removed from note --- docs/en/query_language/system.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/query_language/system.md b/docs/en/query_language/system.md index 655e7682c81..74337052a82 100644 --- a/docs/en/query_language/system.md +++ b/docs/en/query_language/system.md @@ -96,7 +96,7 @@ Provides possibility to stop background merges for tables in the MergeTree famil SYSTEM STOP MERGES [[db.]merge_tree_family_table_name] ``` !!! note "Note": - `DETACH / ATTACH` table will start background merges for the table even in case when merges have been stopped for all *MergeTree tables before. + `DETACH / ATTACH` table will start background merges for the table even in case when merges have been stopped for all MergeTree tables before. ### START MERGES {#query_language-system-start-merges}