From 94afe26d4cecf4d1e309a8e0fd878ca610505f18 Mon Sep 17 00:00:00 2001 From: KochetovNicolai Date: Thu, 14 Jun 2018 14:07:57 +0300 Subject: [PATCH 1/3] Update summingmergetree.md Added linefeed. --- docs/ru/table_engines/summingmergetree.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/ru/table_engines/summingmergetree.md b/docs/ru/table_engines/summingmergetree.md index da49ae0b257..6b3302a6017 100644 --- a/docs/ru/table_engines/summingmergetree.md +++ b/docs/ru/table_engines/summingmergetree.md @@ -24,7 +24,9 @@ SummingMergeTree(EventDate, (OrderID, EventDate, BannerID, ...), 8192, (Shows, C Если название вложенной таблицы заканчивается на Map и она содержит не менее двух столбцов, удовлетворяющих следующим критериям: - первый столбец - числовой ((U)IntN, Date, DateTime), назовем его условно key, -- остальные столбцы - арифметические ((U)IntN, Float32/64), условно (values...), то такая вложенная таблица воспринимается как отображение key =`>` (values...) и при слиянии ее строк выполняется слияние элементов двух множеств по key со сложением соответствующих (values...). +- остальные столбцы - арифметические ((U)IntN, Float32/64), условно (values...), + +то такая вложенная таблица воспринимается как отображение key `=>` (values...) и при слиянии ее строк выполняется слияние элементов двух множеств по key со сложением соответствующих (values...). Примеры: From 29c7c36957a19f57d33a6d464ff5f3a55618aca0 Mon Sep 17 00:00:00 2001 From: KochetovNicolai Date: Thu, 14 Jun 2018 14:09:28 +0300 Subject: [PATCH 2/3] Update summingmergetree.md Added linefeed. --- docs/en/table_engines/summingmergetree.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/en/table_engines/summingmergetree.md b/docs/en/table_engines/summingmergetree.md index 19f690ef9c1..32f97cfb744 100644 --- a/docs/en/table_engines/summingmergetree.md +++ b/docs/en/table_engines/summingmergetree.md @@ -24,7 +24,9 @@ In addition, a table can have nested data structures that are processed in a spe If the name of a nested table ends in 'Map' and it contains at least two columns that meet the following criteria: - The first table is numeric ((U)IntN, Date, DateTime), which we'll refer to as the 'key'. -- The other columns are arithmetic ((U)IntN, Float32/64), which we'll refer to as '(values...)'. Then this nested table is interpreted as a mapping of key =`>` (values...), and when merging its rows, the elements of two data sets are merged by 'key' with a summation of the corresponding (values...). +- The other columns are arithmetic ((U)IntN, Float32/64), which we'll refer to as '(values...)'. + +Then this nested table is interpreted as a mapping of key `=>` (values...), and when merging its rows, the elements of two data sets are merged by 'key' with a summation of the corresponding (values...). Examples: From 3178f57f54c2b2cd335af051488f72aaa0aacdbb Mon Sep 17 00:00:00 2001 From: ezhaka Date: Thu, 14 Jun 2018 19:29:09 +0300 Subject: [PATCH 3/3] Do not use exact chown path We've faced with the problem that chown is located in ``/bin/chown`` instead of ``/usr/bin/chown``. We've created symlink in order to bypass the problem, but it seems it would be nice to fix the script. --- debian/clickhouse-server.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/clickhouse-server.service b/debian/clickhouse-server.service index b91de6f56eb..b2e041fce86 100644 --- a/debian/clickhouse-server.service +++ b/debian/clickhouse-server.service @@ -8,7 +8,7 @@ Group=clickhouse PermissionsStartOnly=true Restart=always RestartSec=30 -ExecStartPre=/usr/bin/chown clickhouse:clickhouse -R /etc/clickhouse-server +ExecStartPre=chown clickhouse:clickhouse -R /etc/clickhouse-server ExecStart=/usr/bin/clickhouse-server --config=/etc/clickhouse-server/config.xml LimitCORE=infinity LimitNOFILE=500000