Commit Graph

643 Commits

Author SHA1 Message Date
alexey-milovidov
c5dac3d496
Merge pull request #3724 from ClickHouse-Ninja/master
timeSlots: add optional parameter 'Size'
2018-12-02 03:34:52 +03:00
Kirill Shvakov
566644b171 timeSlots: add optional parameter 'Size' 2018-12-01 10:01:20 +02:00
Ivan Blinkov
3a6d5ad489
WIP on website+docs (#3668)
* CLICKHOUSE-4063: less manual html @ index.md

* CLICKHOUSE-4063: recommend markdown="1" in README.md

* CLICKHOUSE-4003: manually purge custom.css for now

* CLICKHOUSE-4064: expand <details> before any print (including to pdf)

* CLICKHOUSE-3927: rearrange interfaces/formats.md a bit

* CLICKHOUSE-3306: add few http headers

* Remove copy-paste introduced in #3392

* Hopefully better chinese fonts #3392

* get rid of tabs @ custom.css

* Apply comments and patch from #3384

* Add jdbc.md to ToC and some translation, though it still looks badly incomplete

* minor punctuation

* Add some backlinks to official website from mirrors that just blindly take markdown sources

* Do not make fonts extra light

* find . -name '*.md' -type f | xargs -I{} perl -pi -e 's//g' {}

* find . -name '*.md' -type f | xargs -I{} perl -pi -e 's/ sql/g' {}

* Remove outdated stuff from roadmap.md

* Not so light font on front page too

* Refactor Chinese formats.md to match recent changes in other languages

* Update some links on front page

* Remove some outdated comment

* Add twitter link to front page

* More front page links tuning

* Add Amsterdam meetup link

* Smaller font to avoid second line

* Add Amsterdam link to README.md

* Proper docs nav translation

* Back to 300 font-weight except Chinese

* fix docs build

* Update Amsterdam link

* remove symlinks

* more zh punctuation

* apply lost comment by @zhang2014

* Apply comments by @zhang2014 from #3417

* Remove Beijing link

* rm incorrect symlink

* restore content of docs/zh/operations/table_engines/index.md

* CLICKHOUSE-3751: stem terms while searching docs

* CLICKHOUSE-3751: use English stemmer in non-English docs too

* CLICKHOUSE-4135 fix

* Remove past meetup link

* Add blog link to top nav

* Add ContentSquare article link

* Add form link to front page + refactor some texts

* couple markup fixes

* minor

* Introduce basic ODBC driver page in docs

* More verbose 3rd party libs disclaimer

* Put third-party stuff into a separate folder

* Separate third-party stuff in ToC too

* Update links

* Move stuff that is not really (only) a client library into a separate page

* Add clickhouse-hdfs-loader link

* Some introduction for "interfaces" section

* Rewrite tcp.md

* http_interface.md -> http.md

* fix link

* Remove unconvenient error for now

* try to guess anchor instead of failing

* remove symlink

* Remove outdated info from introduction

* remove ru roadmap.md

* replace ru roadmap.md with symlink

* Update roadmap.md

* lost file

* Title case in toc_en.yml

* Sync "Functions" ToC section with en

* Remove reference to pretty old ClickHouse release from docs

* couple lost symlinks in fa
2018-11-27 14:13:59 +03:00
alexey-milovidov
980e077842
Update settings.md 2018-11-24 02:29:10 +03:00
alexey-milovidov
af013285e9
Merge branch 'master' into base64_functions 2018-11-23 21:33:56 +03:00
alexey-milovidov
1002ed7487
Merge branch 'master' into 3958/many_templates 2018-11-23 01:48:42 +03:00
alexey-milovidov
a78984bc3d
Update reference.md 2018-11-23 01:40:41 +03:00
Alexey Milovidov
6288f0f07b Updated administration tips [#CLICKHOUSE-3] 2018-11-22 22:52:26 +03:00
BayoNet
361c0b8e59 New topic in the docs "Permissions for queries" (#3616)
* Update of english version of descriprion of the table function `file`.

* New syntax for ReplacingMergeTree.
Some improvements in text.

* Significantly change article about SummingMergeTree.
Article is restructured, text is changed in many places of the document. New syntax for table creation is described.

* Descriptions of AggregateFunction and AggregatingMergeTree are updated. Russian version.

* New syntax for new syntax of CREATE TABLE

* Added english docs on Aggregating, Replacing and SummingMergeTree.

* CollapsingMergeTree docs. English version.

* 1. Update of CollapsingMergeTree. 2. Minor changes in markup

* Update aggregatefunction.md

* Update aggregatefunction.md

* Update aggregatefunction.md

* Update aggregatingmergetree.md

* GraphiteMergeTree docs update.
New syntax for creation of Replicated* tables.
Minor changes in *MergeTree tables creation syntax.

* Markup fix

* Markup and language fixes

* Clarification in the CollapsingMergeTree article

* DOCAPI-4821. Sync between ru and en versions of docs.

* Fixed the ambiguity in geo functions description.

* Example of JOIN in ru docs

* Deleted misinforming example.

* New topic 'Permissions for queries'

* Fixes for docs consistency.

* Self-targeting link.
2018-11-20 18:26:56 +03:00
Alexandr Krasheninnikov
177a00f09a Merge https://github.com/yandex/ClickHouse into base64_functions 2018-11-14 12:32:42 +03:00
alexey-milovidov
062a56b9fc
Update external_dicts_dict_sources.md 2018-11-13 20:52:15 +03:00
Alexander Kuranoff
92bc884ccb Update nyc_taxi.md (#3558)
Delete the dot in a sentese
2018-11-11 11:07:10 +01:00
Alexander Kuranoff
8098900efa Update http_interface.md (#3559)
Fixed word
2018-11-11 11:06:50 +01:00
Alexander Kuranoff
1b7b8e48bb Update formats.md (#3560)
Fixed word
2018-11-11 11:06:18 +01:00
BayoNet
1ba752e931 Russian version of hasAll hasAny docs. (#3550)
* Update of english version of descriprion of the table function `file`.

* New syntax for ReplacingMergeTree.
Some improvements in text.

* Significantly change article about SummingMergeTree.
Article is restructured, text is changed in many places of the document. New syntax for table creation is described.

* Descriptions of AggregateFunction and AggregatingMergeTree are updated. Russian version.

* New syntax for new syntax of CREATE TABLE

* Added english docs on Aggregating, Replacing and SummingMergeTree.

* CollapsingMergeTree docs. English version.

* 1. Update of CollapsingMergeTree. 2. Minor changes in markup

* Update aggregatefunction.md

* Update aggregatefunction.md

* Update aggregatefunction.md

* Update aggregatingmergetree.md

* GraphiteMergeTree docs update.
New syntax for creation of Replicated* tables.
Minor changes in *MergeTree tables creation syntax.

* Markup fix

* Markup and language fixes

* Clarification in the CollapsingMergeTree article

* DOCAPI-4821. Sync between ru and en versions of docs.

* Fixed the ambiguity in geo functions description.

* Example of JOIN in ru docs

* Deleted misinforming example.

* Descriptions for array functions 'hasAll' and 'hasAny' are translated into russian.

* Update array_functions.md
2018-11-10 23:00:22 +03:00
Alexandr Krasheninnikov
6ab45d081c Arch-based compilation 2018-11-02 22:06:05 +03:00
BayoNet
bcab45b3fc Partial sync between ru and en version (#3464)
* Update of english version of descriprion of the table function `file`.

* New syntax for ReplacingMergeTree.
Some improvements in text.

* Significantly change article about SummingMergeTree.
Article is restructured, text is changed in many places of the document. New syntax for table creation is described.

* Descriptions of AggregateFunction and AggregatingMergeTree are updated. Russian version.

* New syntax for new syntax of CREATE TABLE

* Added english docs on Aggregating, Replacing and SummingMergeTree.

* CollapsingMergeTree docs. English version.

* 1. Update of CollapsingMergeTree. 2. Minor changes in markup

* Update aggregatefunction.md

* Update aggregatefunction.md

* Update aggregatefunction.md

* Update aggregatingmergetree.md

* GraphiteMergeTree docs update.
New syntax for creation of Replicated* tables.
Minor changes in *MergeTree tables creation syntax.

* Markup fix

* Markup and language fixes

* Clarification in the CollapsingMergeTree article

* DOCAPI-4821. Sync between ru and en versions of docs.

* Fixed the ambiguity in geo functions description.

* Example of JOIN in ru docs

* Deleted misinforming example.
2018-11-01 16:28:45 +03:00
BayoNet
53e2ec08ce Bitwise aggregate functions are translated into russian (#3486)
* Update of english version of descriprion of the table function `file`.

* New syntax for ReplacingMergeTree.
Some improvements in text.

* Significantly change article about SummingMergeTree.
Article is restructured, text is changed in many places of the document. New syntax for table creation is described.

* Descriptions of AggregateFunction and AggregatingMergeTree are updated. Russian version.

* New syntax for new syntax of CREATE TABLE

* Added english docs on Aggregating, Replacing and SummingMergeTree.

* CollapsingMergeTree docs. English version.

* 1. Update of CollapsingMergeTree. 2. Minor changes in markup

* Update aggregatefunction.md

* Update aggregatefunction.md

* Update aggregatefunction.md

* Update aggregatingmergetree.md

* GraphiteMergeTree docs update.
New syntax for creation of Replicated* tables.
Minor changes in *MergeTree tables creation syntax.

* Markup fix

* Markup and language fixes

* Clarification in the CollapsingMergeTree article

* Bitwise aggregate functions are translated info russian.
2018-11-01 16:27:01 +03:00
ggerogery
091e0ba0c2 Update index.md
Небольшие исправления текста.
2018-11-01 12:32:44 +03:00
zamulla
b7c794bf7d
Typo 2018-10-31 15:56:30 +03:00
BayoNet
e3c2a2afd9 Clarifications for MySQL table engine and toStartOfMonth function (#3440)
* Update of english version of descriprion of the table function `file`.

* New syntax for ReplacingMergeTree.
Some improvements in text.

* Significantly change article about SummingMergeTree.
Article is restructured, text is changed in many places of the document. New syntax for table creation is described.

* Descriptions of AggregateFunction and AggregatingMergeTree are updated. Russian version.

* New syntax for new syntax of CREATE TABLE

* Added english docs on Aggregating, Replacing and SummingMergeTree.

* CollapsingMergeTree docs. English version.

* 1. Update of CollapsingMergeTree. 2. Minor changes in markup

* Update aggregatefunction.md

* Update aggregatefunction.md

* Update aggregatefunction.md

* Update aggregatingmergetree.md

* GraphiteMergeTree docs update.
New syntax for creation of Replicated* tables.
Minor changes in *MergeTree tables creation syntax.

* Markup fix

* Markup and language fixes

* Clarification in the CollapsingMergeTree article

* Clarifications for MySQL table engine and toStartOfMonth function
2018-10-22 21:45:23 +03:00
BayoNet
b5edce0e32 Updates for Aggregating-,Collapsing-, Replacing- and SummingMergeTree. (#3346)
* Update of english version of descriprion of the table function `file`.

* New syntax for ReplacingMergeTree.
Some improvements in text.

* Significantly change article about SummingMergeTree.
Article is restructured, text is changed in many places of the document. New syntax for table creation is described.

* Descriptions of AggregateFunction and AggregatingMergeTree are updated. Russian version.

* New syntax for new syntax of CREATE TABLE

* Added english docs on Aggregating, Replacing and SummingMergeTree.

* CollapsingMergeTree docs. English version.

* 1. Update of CollapsingMergeTree. 2. Minor changes in markup

* Update aggregatefunction.md

* Update aggregatefunction.md

* Update aggregatefunction.md

* Update aggregatingmergetree.md

* GraphiteMergeTree docs update.
New syntax for creation of Replicated* tables.
Minor changes in *MergeTree tables creation syntax.

* Markup fix

* Markup and language fixes

* Clarification in the CollapsingMergeTree article
2018-10-19 14:25:22 +03:00
Ivan Lezhankin
6d783ef013 Move-away "uniqCombined" as a separate aggregated function with HLL precision 2018-10-17 17:31:06 +03:00
alesapin
457f8fd495
Merge pull request #3389 from yandex/CLICKHOUSE-4067
CLICKHOUSE-4067: Fixes in odbc dictionaries. Now dictionaries receive…
2018-10-16 15:37:23 +03:00
Ivan Blinkov
8623cb232c
WIP on docs/website (#3383)
* CLICKHOUSE-4063: less manual html @ index.md

* CLICKHOUSE-4063: recommend markdown="1" in README.md

* CLICKHOUSE-4003: manually purge custom.css for now

* CLICKHOUSE-4064: expand <details> before any print (including to pdf)

* CLICKHOUSE-3927: rearrange interfaces/formats.md a bit

* CLICKHOUSE-3306: add few http headers

* Remove copy-paste introduced in #3392

* Hopefully better chinese fonts #3392

* get rid of tabs @ custom.css

* Apply comments and patch from #3384

* Add jdbc.md to ToC and some translation, though it still looks badly incomplete

* minor punctuation

* Add some backlinks to official website from mirrors that just blindly take markdown sources

* Do not make fonts extra light

* find . -name '*.md' -type f | xargs -I{} perl -pi -e 's//g' {}

* find . -name '*.md' -type f | xargs -I{} perl -pi -e 's/ sql/g' {}

* Remove outdated stuff from roadmap.md

* Not so light font on front page too

* Refactor Chinese formats.md to match recent changes in other languages
2018-10-16 13:47:17 +03:00
Maksim
9e813f911c Added third-party http client library for python (#3394)
* Added third-party client library for python

* Added third-party client library for python (rus)
2018-10-16 10:42:56 +03:00
alesapin
c951ec7bad CLICKHOUSE-4067: Fixes in odbc dictionaries. Now dictionaries receives bridge path from global config (as it was before). Quotation performed on table and schema independently. Add tests with postgres interaction. Update documentation 2018-10-15 17:49:23 +03:00
Ivan Blinkov
6bbbb55615 Fix some punctuation 2018-10-12 16:28:34 +03:00
Ivan Blinkov
415f763910 Some sync between 3rd party software lists 2018-10-12 16:26:57 +03:00
Ivan Blinkov
be8490813a
#3347 fix (#3354) 2018-10-11 22:06:04 +03:00
Denis Burlaka
5ad7fc2455
dbeaver infomation added
Добавил dbeaver в качестве клиента БД.
2018-10-11 15:51:25 +03:00
alexey-milovidov
1472e3ae66
Merge pull request #3210 from alex-krash/jdbc-bridge
External database access unification (jdbc/odbc bridges)
2018-10-10 02:26:56 +03:00
alexey-milovidov
6ed6e2de00
Merge pull request #3303 from BayoNet/master
Warning about vulnerability of ODBC driver
2018-10-10 02:11:21 +03:00
Alex Zatelepin
7aa54e7022
Update alter.md 2018-10-09 20:28:51 +03:00
Alexey Milovidov
574c4da419 Updated tips (tnx. Vladislav U. from the Telegram chat) [#CLICKHOUSE-2] 2018-10-09 17:38:59 +03:00
Sjoerd Mulder
f305b01d6f
Update russian 2018-10-09 12:34:46 +02:00
Artem Zuikov
af0e743b94
fix wrong description 2018-10-08 16:25:17 +03:00
Artem Zuikov
5f5221a149
[docs] link Dictionary engine to Dictionaries docs 2018-10-08 16:13:11 +03:00
BayoNet
a6d95b9460 Textual edits in ODBC dictionary description. 2018-10-08 13:20:34 +03:00
Сундуков Алексей
1ef8b48ba0 Update index.md (#3314)
Орфографическая ошибка.
2018-10-08 13:06:21 +03:00
Ivan Blinkov
c939f000fe fix comment by @millin 2018-10-05 19:34:49 +03:00
Ivan Blinkov
99d54ccd61
WIP on website/docs (#3237)
* lost backtick

* back to short examples on docs front page

* publish sitemap_static.xml too

* add link to "fa" sitemap

* add "fa" to robots.txt

* Add upcoming Beijing meetup link

* Adapt css to second meetup link

* Website front page tuning

* Decimal docs in English

* Kind of fix CLICKHOUSE-4010

* Lost blank line

* fix poco submodule

* Remove Paris link from front page
2018-10-05 18:56:05 +03:00
BayoNet
63c309bf3e Added the warning about the vulnerability of the ODBC driver. 2018-10-05 18:19:08 +03:00
Andrey
0cd6d095e9
Update access_rights.md
Change 'нет доступа к отдельным ДБ' to 'нет доступа к отдельным БД'
2018-10-04 15:26:49 +03:00
Alexandr Krasheninnikov
c7fee9374c fix formatting errors according code review 2018-10-03 13:44:43 +03:00
Andrey
1815c101a0
Update select.md
Change 'Если качестве правой части оператора' on 'Если в качестве правой части оператора'
2018-10-03 12:46:55 +03:00
Andrey
038169e0a7
Update nested.md
Change 'как в запроса' on  'как у запроса'
2018-10-03 10:10:28 +03:00
Alexander Marshalov
de92ecfe32
Fix broken link in doc 2018-10-03 06:04:06 +07:00
Alexandr Krasheninnikov
c3f10e76fc Add doc for jdbc table function 2018-10-01 10:45:59 +03:00
alexey-milovidov
0dd4bb43a3
Update string_search_functions.md 2018-09-25 21:19:15 +03:00
alexey-milovidov
c449319a3b
Update string_search_functions.md 2018-09-25 21:18:50 +03:00
Alexey Milovidov
b972742f9a Fixed bad code; updated docs #3195 2018-09-22 21:07:27 +03:00
Alex Krash
c29357212a Add examples for alphaTokens and argMin (#3189) 2018-09-21 18:13:45 +03:00
chertus
dd62b7bc23 more docs for Decimal 2018-09-19 17:09:37 +03:00
chertus
789e5814f9 one another docs fix 2018-09-19 16:59:53 +03:00
chertus
2ef3473ef1 one more docs fix 2018-09-19 16:53:40 +03:00
chertus
f5e82687a5 docs hotfix 2018-09-19 16:52:32 +03:00
chertus
771bc2eaac Russian documentation for Decimal [CLICKHOUSE-3765] 2018-09-19 16:45:46 +03:00
Alexey Milovidov
41bde049ab Merge remote-tracking branch 'origin/master' into alex-krash-function_format_date 2018-09-18 21:39:02 +03:00
Alexey Milovidov
dde8ca03cf Merge branch 'function_format_date' of https://github.com/alex-krash/ClickHouse into alex-krash-function_format_date 2018-09-18 19:19:29 +03:00
proller
7eecfdbcf5 wip 2018-09-18 18:59:14 +03:00
Vojtech Splichal
b319c29aaf fix documentation kafka per topic configuration 2018-09-18 14:59:12 +02:00
Alexander Krasheninnikov
64533ff4df Add support for Date, filled documentation 2018-09-18 03:32:24 +03:00
Alexey Zatelepin
48d5d03d27 add notice that dots in cluster names are forbidden [#CLICKHOUSE-3983] 2018-09-17 20:56:24 +03:00
alexey-milovidov
be51dccbb7
Merge pull request #3126 from VadimPE/CLICKHOUSE-3476
[CLICKHOUSE-3476] add invalidate_query for ClickHouse in Dictionary
2018-09-14 21:18:09 +03:00
alexey-milovidov
dcfe84b5fd
Merge pull request #3128 from VadimPE/part_id_in_log
Add partition_id in part_log
2018-09-13 21:52:52 +03:00
VadimPE
bd8cf4006b add doc 2018-09-13 18:59:55 +03:00
VadimPE
383f0da97d CLICKHOUSE-3476 add doc 2018-09-13 18:18:54 +03:00
Nikolay Kirsh
5f753eceb2
Опечатка в пользлователей 2018-09-13 16:03:48 +03:00
Alexey Zatelepin
133c9c7c37 Merge branch 'master' into alter-update
Conflicts:
	docs/en/query_language/alter.md
2018-09-07 19:11:02 +03:00
Ivan Blinkov
4b43fdd3f2
More docs fixes (#3068)
* lost backtick

* back to short examples on docs front page

* publish sitemap_static.xml too

* add link to "fa" sitemap

* add "fa" to robots.txt
2018-09-07 13:27:44 +03:00
Ivan Blinkov
b99dbd4be6 Remove outdated note 2018-09-06 16:01:21 +03:00
Alexey Zatelepin
17228b8908 add docs [#CLICKHOUSE-13] 2018-09-05 16:27:05 +03:00
Ivan Blinkov
b40284d598 Merge branch 'master' of github.com:yandex/ClickHouse 2018-09-05 15:42:32 +03:00
Sergey Zaikin
3c10fbfaba Update external_dicts_dict_sources.md (#3043)
Set PostgreSQL section level equals MS SQL section level
2018-09-05 15:37:49 +03:00
Pavel Patrin
7795a6f1bc Update tinylog.md (#3042)
Пишите, Карл!
2018-09-05 15:33:28 +03:00
Ivan Blinkov
6eb63e340d Apply useful patches from TANKER-453459 2018-09-05 12:33:11 +03:00
BayoNet
324fd98de6 Update of english documentation (#2918)
* Updating of english translation.

* Some bugs are fixed.
2018-09-04 14:18:59 +03:00
Alexander Marshalov
5cb3501afb
Fix small typos in russian version memory.md 2018-09-02 16:25:15 +07:00
alexey-milovidov
cfb448cce6
Update query_complexity.md 2018-08-31 23:02:57 +03:00
Alexey Milovidov
6e97791348 Updated ZooKeeper admin tips [#CLICKHOUSE-3] 2018-08-28 20:07:01 +03:00
Stas Pavlovichev
23c41c17a9
10'th path have to be included
It seems like 10th path should be included in scanning.
2018-08-28 15:03:26 +03:00
alexey-milovidov
eb5f571935
Merge pull request #2959 from VadimPE/CLICKHOUSE-3914
CLICKHOUSE-3914 add doc for CASE without ELSE
2018-08-27 15:36:06 +03:00
VadimPE
5c0039f124 CLICKHOUSE-3914 fix 2018-08-27 15:31:17 +03:00
VadimPE
83ff0d2721 CLICKHOUSE-3914 add doc for CASE without ELSE 2018-08-27 12:21:40 +03:00
Sjoerd Mulder
9fa0c33b66 Adding third-party scala driver (#2945)
* Adding scala driver

* Update ru doc
2018-08-24 17:36:09 +03:00
Ivan Blinkov
5f4a155582 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-22 16:15:22 +03:00
alexey-milovidov
4c0b30fb7d
Update mergetree.md 2018-08-22 09:44:04 +03:00
alexey-milovidov
87fb9cc997
Update mergetree.md 2018-08-22 09:38:01 +03:00
alexey-milovidov
622c4b84d9
Update mergetree.md 2018-08-22 09:37:35 +03:00
alexey-milovidov
33479b6d6c
Update mergetree.md 2018-08-22 09:37:05 +03:00
alexey-milovidov
6de5f7df1e
Update mergetree.md 2018-08-22 09:32:16 +03:00
alexey-milovidov
df8bf949d0
Update mergetree.md 2018-08-22 09:30:23 +03:00
alexey-milovidov
90788dbd2e
Update mergetree.md 2018-08-22 09:29:36 +03:00
alexey-milovidov
bcd862ab74
Update file.md 2018-08-22 09:23:28 +03:00
alexey-milovidov
33f3841450
Update file.md 2018-08-22 09:22:06 +03:00
alexey-milovidov
34fafdb901
Update file.md 2018-08-22 09:20:05 +03:00
alexey-milovidov
d258c2f5e3
Update rounding_functions.md 2018-08-22 09:18:29 +03:00
BayoNet
5bd8baf9ed Merge branch 'updating-docs' 2018-08-21 10:55:54 +03:00
BayoNet
969225b372 Merge remote-tracking branch 'upstream/master' into updating-docs 2018-08-21 10:55:28 +03:00
BayoNet
d18e249728 Updated description of MergeTree. 2018-08-21 10:54:37 +03:00
Ivan Blinkov
40aa97d1cf Add example from #2892 to docs 2018-08-20 12:29:28 +03:00
BayoNet
20f5606fb4 Correction and clarification of descriptions of file() and round(). 2018-08-16 11:25:35 +03:00
BayoNet
8ea7c63f3c Merge remote-tracking branch 'upstream/master' 2018-08-15 14:04:31 +03:00
BayoNet
613c1669f2 Update of file() table function description. 2018-08-15 13:58:37 +03:00
BayoNet
ce58107568 Update of round(x [, N]) description. 2018-08-15 13:56:54 +03:00
BayoNet
3abeff5aa9 Merge branch 'master' into updating-docs 2018-08-15 09:52:18 +03:00
alexey-milovidov
e99738a7d1
Merge pull request #2835 from BayoNet/master
Settings for quorum INSERT
2018-08-14 17:53:58 +03:00
alexey-milovidov
337cf525b6
Update geo.md 2018-08-14 17:52:38 +03:00
alexey-milovidov
bbb7900266
Update settings.md 2018-08-14 17:42:17 +03:00
BayoNet
f3d464e741 Merge remote-tracking branch 'upstream/master' into updating-docs 2018-08-14 04:53:39 +03:00
BayoNet
4abca43c5d Correcting of select_sequential_consistency description. 2018-08-14 04:48:59 +03:00
Alexander Marshalov
57aa1f9726 fix typo (#2859) 2018-08-13 18:08:29 +03:00
BayoNet
6b9aac7760 Function pointInPolygon. 2018-08-13 17:51:06 +03:00
Ivan Blinkov
94f86eda79
WIP on docs: improvements for search + some content changes (#2842)
* Some improvements for introduction/performance.md

* Minor improvements for example_datasets

* Add website/package-lock.json to .gitignore

* YT paragraph was badly outdated and there is no real reason to write a new one

* Use weird introduction article as a starting point for F.A.Q.

* Some refactoring of first half of ya_metrika_task.md

* minor

* Weird docs footer bugfix

* Forgotten redirect

* h/v scrollbars same size in docs

* CLICKHOUSE-3831: introduce security changelog

* A bit more narrow tables on docs front page

* fix flag in ru docs

* Save some space in top level of docs ToC

* Capitalize most words in titles of docs/en/

* more docs scrollbar fixes

* fix incorrect merge

* fix link

* fix switching languages in single page docs mode

* Update mkdocs & mkdocs-material + unminify javascript

* cherrypick 17e18d1ecc
2018-08-10 17:44:49 +03:00
BayoNet
8429ed5221 Update for Array data type 2018-08-10 16:10:23 +03:00
BayoNet
c1c0145d9b Small fixes and clarifications. 2018-08-10 11:17:39 +03:00
BayoNet
55cd965db7 Merge remote-tracking branch 'upstream/master' into updating-docs 2018-08-08 23:42:28 +03:00
BayoNet
b84f5faa4e Quorum INSERT settings. 2018-08-08 23:41:14 +03:00
Ivan Blinkov
02b8b55aea
fix mistype 2018-08-08 18:22:47 +03:00
Ivan Blinkov
9977788daf
WIP on docs (#2819)
* Some improvements for introduction/performance.md

* Minor improvements for example_datasets

* Add website/package-lock.json to .gitignore

* YT paragraph was badly outdated and there is no real reason to write a new one

* Use weird introduction article as a starting point for F.A.Q.

* Some refactoring of first half of ya_metrika_task.md

* minor

* Weird docs footer bugfix

* Forgotten redirect

* h/v scrollbars same size in docs

* CLICKHOUSE-3831: introduce security changelog

* A bit more narrow tables on docs front page
2018-08-07 15:06:41 +03:00
Alexey Zatelepin
1f2d4f90b9 allow empty parts after merge for Summing, Collapsing and VersionedCollapsing engines [#CLICKHOUSE-3879] 2018-08-06 19:54:00 +03:00
Alexey Zatelepin
7062807d8c add docs for mutations cleaner [#CLICKHOUSE-3828] 2018-08-03 22:21:44 +03:00
Alexander Marshalov
154d7e3228 Added SETTINGS clause for Kafka storage engine 2018-08-03 21:51:28 +03:00
alexey-milovidov
9f23d7c497 Update parametric_functions.md 2018-08-01 19:47:30 +03:00
BayoNet
da3e2a6de2 Added changes from english version of documentation to the russian one. 2018-08-01 19:47:30 +03:00
alexey-milovidov
8527d4f4dd
Update parametric_functions.md 2018-08-01 19:45:59 +03:00
BayoNet
7bded99324 Merge remote-tracking branch 'upstream/master' 2018-08-01 12:28:20 +03:00
BayoNet
2bb93c14df Added changes from english version of documentation to the russian one. 2018-08-01 12:21:12 +03:00
alexey-milovidov
ef4ecd615f
Update enum.md 2018-07-30 22:51:14 +03:00
alexey-milovidov
6a71a1ea13
Merge branch 'master' into master 2018-07-30 22:49:07 +03:00
Ivan Blinkov
b589903680
WIP on docs (#2753)
* Some improvements for introduction/performance.md

* Minor improvements for example_datasets

* Add website/package-lock.json to .gitignore

* YT paragraph was badly outdated and there is no real reason to write a new one

* Use weird introduction article as a starting point for F.A.Q.

* Some refactoring of first half of ya_metrika_task.md

* minor

* Weird docs footer bugfix
2018-07-30 19:34:55 +03:00
alesapin
71694f0eb2 Add <yandex> tag in PostgreSQL external dictionary config 2018-07-30 17:03:29 +03:00
chertus
b631924d46 CLICKHOUSE-2 fix docs 2018-07-30 13:51:29 +03:00
BayoNet
8879c75d8b Improvements based on comments on https://github.com/yandex/ClickHouse/pull/2730 2018-07-27 16:00:01 +03:00
BayoNet
cf1380fc77 Merge remote-tracking branch 'upstream/master' 2018-07-27 14:30:45 +03:00
Ivan Blinkov
20c68e5a6f
WIP on docs introduction articles (#2716)
* WIP on content of distinctive_features.md

* WIP on content of features_considered_disadvantages.md
2018-07-27 14:26:20 +03:00
alexey-milovidov
d0507bb639
Update url.md 2018-07-27 14:18:54 +03:00
alesapin
c0f5e33fe8 Add docs for URL table engine and url table function 2018-07-27 13:21:04 +03:00
BayoNet
6555b05c77 Fixed links after restructurization of the documentation. 2018-07-26 21:02:40 +03:00
BayoNet
5b9dfcb486 Merge remote-tracking branch 'upstream/master' 2018-07-26 20:03:23 +03:00
BayoNet
afd57d0372 - Functions with special support for NULL
- Descriptions for functons: arrayResize, multiIf, getSizeOfEnumType, toColumnTypeName, dumpColumnStructure, defaultValueOfArgumentType, indexHint, replicate.
- Enum description is updated
2018-07-26 17:41:59 +03:00
Alexey Milovidov
57f9abf6b2 Added clarifications for ZooKeeper operations [#CLICKHOUSE-3] 2018-07-25 22:34:58 +03:00
alexey-milovidov
743f904a64
Merge pull request #2714 from blinkov/CLICKHOUSE-2720
Refactoring that also fixes CLICKHOUSE-3858
2018-07-25 14:23:07 +03:00
BayoNet
c31dca2c04 Tuple description is updated. 2018-07-25 09:10:07 +03:00
zhang2014
7e87fa8e18 ISSUES-2688 support on cluster for kill & optimize query 2018-07-24 22:07:13 +03:00
Ivan Blinkov
5ad0d74dff Hide example on main docs page behind spoiler 2018-07-24 19:37:57 +03:00
Ivan Blinkov
c7e526e050
WIP on documentation (#2692)
* Additional .gitignore entries

* Merge a bunch of small articles about system tables into single one

* Merge a bunch of small articles about formats into single one

* Adapt table with formats to English docs too

* Add SPb meetup link to main page

* Move Utilities out of top level of docs (the location is probably not yet final) + translate couple articles

* Merge MacOS.md into build_osx.md

* Move Data types higher in ToC

* Publish changelog on website alongside documentation

* Few fixes for en/table_engines/file.md

* Use smaller header sizes in changelogs

* Group up table engines inside ToC

* Move table engines out of top level too

* Specificy in ToC that query language is SQL based. Thats a bit excessive, but catches eye.

* Move stuff that is part of query language into respective folder

* Move table functions lower in ToC

* Lost redirects.txt update

* Do not rely on comments in yaml + fix few ru titles

* Extract major parts of queries.md into separate articles

* queries.md has been supposed to be removed

* Fix weird translation

* Fix a bunch of links

* There is only table of contents left

* "Query language" is actually part of SQL abbreviation

* Change filename in README.md too

* fix mistype

* s/formats\/interfaces/interfaces\/formats/g

* Remove extra clarification from header as it was too verbose, probably making it a bit more confusing

* Empty article was supposed to be hidden

* At least change incorrect title

* Move special links to the bottom of nav and slightly highlight them

* Skip hidden pages in bottom navigation too

* Make front page of documentation to be part of Introduction

* Make tables in introduction somewhat readable + move abbreviation definitions earlier

* Some introduction text refactoring

* Some docs introduction refactoring

* Use admonitions instead of divs

* Additional .gitignore

* Treat .gif as images too

* Clarify ToC item
2018-07-20 20:35:34 +03:00
Ivan Blinkov
efbde3df4d Clarify ToC item 2018-07-20 18:06:07 +03:00
Ivan Blinkov
fce91c2a8a Use admonitions instead of divs 2018-07-20 15:48:08 +03:00
Ivan Blinkov
89947aef7b Some docs introduction refactoring 2018-07-20 15:47:37 +03:00
Ivan Blinkov
4cb90854e3 Some introduction text refactoring 2018-07-20 12:34:42 +03:00
Ivan Blinkov
1e2c8bf7cf Make tables in introduction somewhat readable + move abbreviation definitions earlier 2018-07-20 12:18:08 +03:00
Ivan Blinkov
103f09e8cc Make front page of documentation to be part of Introduction 2018-07-20 11:55:14 +03:00
MaximAL
aa453c43ce Non-translated and (#2681) 2018-07-19 11:32:35 +03:00
BayoNet
ba04b9dcb8 Functions for Nullable arguments. 2018-07-18 21:45:23 +03:00
Ivan Blinkov
0a4a5b36cc
Some WIP on documentation refactoring (#2659)
* Additional .gitignore entries

* Merge a bunch of small articles about system tables into single one

* Merge a bunch of small articles about formats into single one

* Adapt table with formats to English docs too

* Add SPb meetup link to main page

* Move Utilities out of top level of docs (the location is probably not yet final) + translate couple articles

* Merge MacOS.md into build_osx.md

* Move Data types higher in ToC

* Publish changelog on website alongside documentation

* Few fixes for en/table_engines/file.md

* Use smaller header sizes in changelogs

* Group up table engines inside ToC

* Move table engines out of top level too

* Specificy in ToC that query language is SQL based. Thats a bit excessive, but catches eye.

* Move stuff that is part of query language into respective folder

* Move table functions lower in ToC

* Lost redirects.txt update

* Do not rely on comments in yaml + fix few ru titles

* Extract major parts of queries.md into separate articles

* queries.md has been supposed to be removed

* Fix weird translation

* Fix a bunch of links

* There is only table of contents left

* "Query language" is actually part of SQL abbreviation

* Change filename in README.md too

* fix mistype
2018-07-18 13:00:53 +03:00
BayoNet
ca7f6b3d5b NULL in dictionaries. 2018-07-17 09:34:43 +03:00
BayoNet
09a4f79db6 NULL in aggregate functions. 2018-07-17 09:23:18 +03:00
BayoNet
3a6b95870c NULL in requests. 2018-07-17 08:48:14 +03:00
Alexey Zatelepin
9a001224f7 update docs [#CLICKHOUSE-3748] 2018-07-16 06:22:22 +03:00
alexey-milovidov
6d83ae0356
Update queries.md 2018-07-15 05:08:41 +03:00
Ilya Breev
859a70245a replace POST examples with curl 2018-07-14 15:14:20 +03:00
Ilya Breev
e1ca437766 Update .net section of 3rd party libraries list 2018-07-13 22:30:00 +03:00
alexey-milovidov
95110c4aa8
Update index.md 2018-07-13 22:25:33 +03:00
filimonov
a0814164c0 describing distributed_product_mode in settings.md
See 

7707b5a209/dbms/src/Interpreters/InJoinSubqueriesPreprocessor.h (L17-L32)

576885c6b8/dbms/src/Interpreters/Settings.h (L121)

77fd2f3721/dbms/src/Interpreters/SettingsCommon.cpp (L464-L473)

88efe5ad56/dbms/src/Interpreters/InJoinSubqueriesPreprocessor.cpp (L155)
2018-07-09 17:59:20 +03:00
Ivan Blinkov
e312229344 Few documentation infrastructure improvements (#2613)
* Remove Berlin meetup link

* Do not block browser while single page docs content loads

* Restore sidebar scroll tracking feature

* Temporary hide footer in single page docs mode so it does not jump around

* Swap sidebars in single page docs mode

* fix lost anchor in link

* Explicitly fail if there are errors during docs build
2018-07-09 15:00:38 +03:00
BayoNet
ae8c739c69 Some clarifications about Nullable type and NULLs. 2018-07-08 11:58:43 +03:00
alexey-milovidov
b0ec1423c7
Reordered the list of PHP clients. 2018-07-06 19:33:59 +03:00
Alexey Milovidov
d45ca13fe7 Merge branch 'feature-agg-func-in-summing-merge-tree' of https://github.com/kvap/ClickHouse into kvap-feature-agg-func-in-summing-merge-tree 2018-07-04 23:38:06 +03:00
alexey-milovidov
83bd2cdce3
Update summingmergetree.md 2018-07-04 23:35:20 +03:00
Alexey Milovidov
47958bee7c Merge branch 'feature-agg-func-in-summing-merge-tree' of https://github.com/kvap/ClickHouse into kvap-feature-agg-func-in-summing-merge-tree 2018-07-04 23:34:28 +03:00
BayoNet
29afde3ac9 Described operators IS NULL and IS NOT NULL 2018-07-04 09:21:21 +03:00
BayoNet
0cf2d401de Liks fixes. 2018-07-03 16:07:16 +03:00
BayoNet
f7ba157b10 New data types: Nullable and Nothing.
Processing of Nullable in inserts from selects.
Some links and typographic fixes.
2018-07-03 15:51:46 +03:00
Alex Zatelepin
10adc99dd0
Update queries.md 2018-07-02 21:00:21 +03:00
BayoNet
0a09fc7707 Merge remote-tracking branch 'upstream/master' 2018-06-30 20:12:54 +03:00
BayoNet
c91a2c0de0 NULL-literal. Support for NULLs in data formats. 2018-06-30 20:04:07 +03:00
Alexey Milovidov
74a8996367 Updated information about Gentoo (tnx. kmeaw) [#CLICKHOUSE-2] 2018-06-29 15:07:07 +03:00
Alexey Zatelepin
b8c4a0ba8e add docs draft for mutations [#CLICKHOUSE-3687] 2018-06-28 16:52:00 +03:00
Constantin S. Pan
9cb1d09c20 Update the docs 2018-06-27 10:56:26 +01:00
Dmitry S..ky / skype: dvska-at-skype
2ed5a7c2dd typo fixed 2018-06-26 16:13:34 +03:00
KochetovNicolai
94afe26d4c
Update summingmergetree.md
Added linefeed.
2018-06-14 14:07:57 +03:00
Ivan Blinkov
2d541d3016 Add Berlin meetup link & update roadmap (#2491)
* Update roadmap

* Add Berlin meetup link

* fix indent
2018-06-09 15:21:45 +03:00
Alexey Milovidov
51044279e5 Squashed #2471 2018-06-05 23:09:51 +03:00
Alexandr Krasheninnikov
8d273e776b Syslog logging support 2018-06-01 20:45:03 +03:00
Leonardo Cecchi
969d7837e5 Add Nim libs to third party libraries in docs/en and docs/ru 2018-05-30 08:44:35 +02:00
BayoNet
2ddbe6335a Merge branch 'master' of https://github.com/BayoNet/ClickHouse 2018-05-30 09:08:19 +03:00
BayoNet
ae17feed4c Bugs and broken links fixes. 2018-05-30 09:06:44 +03:00
Alexey Milovidov
24b071e017 Merge branch 'master' of github.com:yandex/ClickHouse 2018-05-26 02:55:29 +03:00
Alexey Milovidov
9f4c22bff3 Miscellaneous [#CLICKHOUSE-3] 2018-05-26 02:55:18 +03:00
alexey-milovidov
53c1922596
Merge pull request #2394 from BayoNet/master
Documentation updates
2018-05-25 23:56:35 +03:00
alexey-milovidov
eed9da96df
Update index.md 2018-05-25 23:30:08 +03:00
BayoNet
40d5447b76 Updated introduction to Formats section 2018-05-24 13:23:19 +03:00
BayoNet
7f783eed03 Updated description of File table engine. 2018-05-16 18:16:46 +03:00
topvisor
b453e2dde9 file() function's description (#2361)
* Create file.md

* Update file.md

* Update file.md

* Update settings.md

* Update file.md

* Update settings.md

* Update file.md

* Update file.md

* Update settings.md

* Update file.md

* Update settings.md

* Update file.md

* Update settings.md

* Update settings.md

* Update file.md

* Update file.md

* Update file.md

* Update file.md

* Update file.md

* Update file.md

* Update settings.md

* Update file.md

* Update settings.md

* Update settings.md

* Update settings.md

* Create file.md

* Update mkdocs_ru.yml

* Update mkdocs_en.yml

* Update settings.md

* Update settings.md

* Update mkdocs_en.yml

* Update mkdocs_ru.yml

* Update mkdocs_en.yml

* Update mkdocs_en.yml

* Update file.md

* Update file.md
2018-05-14 22:58:49 +03:00
BayoNet
d010ec60a9 Merge remote-tracking branch 'upstream/master' 2018-05-14 08:39:27 +03:00
alexey-milovidov
646bea46d8
Update replication.md 2018-05-11 00:47:05 +03:00
BayoNet
42251fc9c0 Geo functions are added. 2018-05-10 19:51:45 +03:00
Alexey Milovidov
4d9088d3d4 Merge branch 'llvm-jit' of https://github.com/pyos/ClickHouse into pyos-llvm-jit 2018-05-10 18:23:53 +03:00
Alexey Milovidov
6ecc6d8ea4 Changed some doc files to symlinks #2277 2018-05-10 17:44:45 +03:00
BayoNet
01beee93ee Editing of external contributions in the documentation. 2018-05-10 02:16:00 +03:00
BayoNet
c739253252 Editing of external contributions in the documentation. 2018-05-09 14:12:15 +03:00
BayoNet
6fd3249913 Merge remote-tracking branch 'upstream/master' 2018-05-08 15:36:12 +03:00
BayoNet
195f142b60 Typo fixes. 2018-05-08 14:50:38 +03:00
Alexsey Shestakov
ed053d222e Improve Russian description of arraySort and arrayReserveSort 2018-05-07 23:54:26 +03:00
Alexsey Shestakov
f8c998618e Add arrayReverseSort,arraySort to docs 2018-05-07 23:54:26 +03:00
KochetovNicolai
c7d2732b80
Update third-party_client_libraries.md 2018-05-07 20:19:16 +03:00
proller
634ba89f90 Build fixes 2018-05-05 15:34:17 +03:00
Alexey Milovidov
5b0761f6d4 Added a link to HouseOps [#CLICKHOUSE-3] 2018-05-01 11:50:56 -07:00
BayoNet
c3a47815ab Codeblock formatting is fixed 2018-04-28 14:53:59 +03:00
BayoNet
38c0442ee6 Changes in accordance with comments from the developers. 2018-04-28 14:45:37 +03:00
BayoNet
1b0d7361cc Merge remote-tracking branch 'upstream/master' 2018-04-28 11:13:06 +03:00
BayoNet
7558684e33 Multiple formatting and links fixes. 2018-04-28 10:58:16 +03:00
alexey-milovidov
093c054b1f
Merge pull request #2263 from luc1ph3r/arbitrary-csv-delimiter
Support an arbitrary CSV delimiter
2018-04-27 13:13:09 -07:00
BayoNet
99b1cbb3c4 Fixed formatting of development/style.md 2018-04-24 01:16:40 +03:00
BayoNet
48ee13e2d9 Fixes of codeblock language and formatting. 2018-04-23 10:34:55 +03:00
BayoNet
765da09e4d Merge branch 'translation_en' with update of english translation. 2018-04-23 09:51:25 +03:00
BayoNet
32b6f0a8af English translation is updated. 2018-04-23 09:20:21 +03:00
Ivan Zhukov
4db476b5cd Update docs about a CSV format 2018-04-22 17:30:25 +03:00
alexey-milovidov
6dd758dc6b
Merge pull request #2224 from BayoNet/master
clickhouse-local description is extended
2018-04-18 23:38:39 +03:00
Vitaliy Lyudvichenko
d4a1407d2d Fixed typo in docs. [#CLICKHOUSE-3] 2018-04-18 15:39:43 +03:00
proller
f8dc8f32d5 Writing changelog (#2215)
* Maybe fix flappy test

* Make changelog

* Revert "Temporary revert doc about new package name (clickhouse-server vs cickhouse-server-common)"

This reverts commit 721153ed53.

* Revert "Temporary revert site about new package name (clickhouse-server vs clickhouse-server-common)"

This reverts commit ba5cb121ae.

* Better changelog

* Better

* Better changelog

* more

* Update CHANGELOG_RU.md

* Update CHANGELOG_RU.md

* Update CHANGELOG_RU.md
2018-04-17 23:57:02 +03:00
Aleksandra (Ася)
29eda3b2de
Update ya_metrika_task.md 2018-04-17 13:19:53 +03:00
BayoNet
e4ab0d8522 docs/utils/clickhouse-local.md is edited by developer comment 2018-04-16 15:27:33 +03:00
BayoNet
be7a7a7e92 Merge remote-tracking branch 'upstream/master' 2018-04-16 08:34:53 +03:00
BayoNet
23d19b3891 The description of clickhouse-local utility is extended. 2018-04-16 08:32:37 +03:00
Alexsey Shestakov
d19a56aa3a Fix x^y math functions description 2018-04-13 22:09:12 +03:00
Konstantin Grabar
87a10ca501 Update third-party_client_libraries.md
Update third-party_client_libraries.md with Elixir libs
2018-04-03 20:28:44 +03:00
proller
721153ed53 Temporary revert doc about new package name (clickhouse-server vs cickhouse-server-common) 2018-04-03 17:46:43 +03:00
alexey-milovidov
d8eba9402e
Update mergetree.md 2018-04-02 23:16:32 +03:00
proller
802cac725f Debian: Rename packages (#678)
* Debian: rename packages

* wip

* wip

* wip

* move limits.d/clickhouse.conf to common

* wip

* fix

* bad clang

* update changelog

* more Provides: Conflicts:

* clickhouse-zookeeper-cli [#CLICKHOUSE-2947]

* fix utils desc

* Fix docs

* use cmake links

* fix doc

* Fix test install

* Test me

* Test me

* Test me.

* Dont use pre-depends

* fix

* Minimize control changes

* del

* debian/clickhouse-common.install -> debian/clickhouse-common-static.install

* debian/clickhouse-common.install -> debian/clickhouse-common-static.install
2018-04-01 15:33:39 +03:00
BayoNet
6881d84bc2 External editions are revised. English translation is actualised from 02.03.2018 version up to 26.03.2018. 2018-03-30 03:20:04 +03:00
BayoNet
2f4d20a0cf Some typos are fixed. 2018-03-30 03:16:19 +03:00
BayoNet
17ee06b0d9 English translation update. 2018-03-30 03:15:52 +03:00
Kirill Shvakov
3b09d2dab3 Docs: add Ninja build to the required libraries (#2136)
* Added Ninja build to the required libraries

* remove ninja from required libraries
2018-03-29 05:59:30 -07:00
alexey-milovidov
26df2f7a85
Revert "English translation is updated" 2018-03-26 17:00:55 +03:00
BayoNet
ec86ecbcdc Some typos are fixed. 2018-03-25 05:37:07 +03:00
BayoNet
4d0582f5cf Merge remote-tracking branch 'upstream/master' 2018-03-25 05:14:13 +03:00
BayoNet
a011a466ab English translation update. 2018-03-25 05:04:22 +03:00
Alexander Marshalov
a6c2e43bd2 The lost information in the Kafka engine documentation has been restored, modified and translated (from commit: https://github.com/yandex/ClickHouse/pull/1654/files#diff-c9ba89e2414c83b5dcc579233c5c80b5) 2018-03-23 18:40:24 +03:00
alexey-milovidov
2590e3b0a6 Update settings.md 2018-03-23 18:37:45 +03:00
Artemeey
1619189ed5 Update settings.md 2018-03-23 18:37:45 +03:00
alexey-milovidov
f8c37d0943
Merge pull request #2050 from BayoNet/master
max_memory_usage parameters description and "Data replication" edition.
2018-03-16 02:31:31 +03:00
alexey-milovidov
ee88475c5b
Update replication.md 2018-03-16 02:30:26 +03:00
alexey-milovidov
93c0dd3f42
Update replication.md 2018-03-16 02:25:57 +03:00
alexey-milovidov
bbb101845a
Update replication.md 2018-03-16 02:24:21 +03:00
alexey-milovidov
70ab16e864
Update query_complexity.md 2018-03-16 02:23:13 +03:00
alexey-milovidov
9017f1d664
Update query_complexity.md 2018-03-16 02:22:36 +03:00
alexey-milovidov
f2505f151a
Merge pull request #2056 from valericus/patch-1
Update mergetree.md
2018-03-15 21:46:51 +03:00