diff --git a/docs/en/interfaces/http_interface.md b/docs/en/interfaces/http.md similarity index 100% rename from docs/en/interfaces/http_interface.md rename to docs/en/interfaces/http.md diff --git a/docs/en/interfaces/index.md b/docs/en/interfaces/index.md index 9f445d45229..e11e1a16ebc 100644 --- a/docs/en/interfaces/index.md +++ b/docs/en/interfaces/index.md @@ -2,7 +2,19 @@ # Interfaces -To explore the system's capabilities, download data to tables, or make manual queries, use the clickhouse-client program. +ClickHouse provides two network interfaces (both can be optionally wrapped in TLS for additional security): +* [HTTP](http.md), which is documented and easy to use directly. +* [Native TCP](tcp.md), which has less overhead. + +In most cases it is recommended to use appropriate tool or library instead of interacting with those directly. Officially supported by Yandex are the following: +* [Command-line client](cli.md) +* [JDBC driver](jdbc.md) +* [ODBC driver](odbc.md) + +There are also a wide range of third-party libraries for working with ClickHouse: +* [Client libraries](third-party/client_libraries.md) +* [Integrations](third-party/integrations.md) +* [Visual interfaces](third-party/gui.md) [Original article](https://clickhouse.yandex/docs/en/interfaces/) diff --git a/docs/en/interfaces/jdbc.md b/docs/en/interfaces/jdbc.md index 8454881dfb7..de735abfdfd 100644 --- a/docs/en/interfaces/jdbc.md +++ b/docs/en/interfaces/jdbc.md @@ -1,7 +1,7 @@ # JDBC Driver - [Official driver](https://github.com/yandex/clickhouse-jdbc). -- Third-party driver from [ClickHouse-Native-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC). +- Third-party driver [ClickHouse-Native-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC). [Original article](https://clickhouse.yandex/docs/en/interfaces/jdbc/) diff --git a/docs/en/interfaces/odbc.md b/docs/en/interfaces/odbc.md new file mode 100644 index 00000000000..845c4e21fb3 --- /dev/null +++ b/docs/en/interfaces/odbc.md @@ -0,0 +1,6 @@ +# ODBC Driver + +- [Official driver](https://github.com/yandex/clickhouse-odbc). + + +[Original article](https://clickhouse.yandex/docs/en/interfaces/odbc/) diff --git a/docs/en/interfaces/tcp.md b/docs/en/interfaces/tcp.md index 86ef118e882..c17e8c15b5e 100644 --- a/docs/en/interfaces/tcp.md +++ b/docs/en/interfaces/tcp.md @@ -1,6 +1,5 @@ # Native Interface (TCP) -The native interface is used in the "clickhouse-client" command-line client for interaction between servers with distributed query processing, and also in C++ programs. We will only cover the command-line client. - +The native protocol is used in the [command-line client](cli.md), for interserver communication during distributed query processing, and also in other C++ programs. Unfortunately, native ClickHouse protocol does not have formal specification yet, but it can be reverse engineered from ClickHouse source code (starting [around here](https://github.com/yandex/ClickHouse/tree/master/dbms/src/Client)) and/or by intercepting and analyzing TCP traffic. [Original article](https://clickhouse.yandex/docs/en/interfaces/tcp/) diff --git a/docs/en/interfaces/third-party_client_libraries.md b/docs/en/interfaces/third-party/client_libraries.md similarity index 84% rename from docs/en/interfaces/third-party_client_libraries.md rename to docs/en/interfaces/third-party/client_libraries.md index 3ae40e829dc..5878d6e0200 100644 --- a/docs/en/interfaces/third-party_client_libraries.md +++ b/docs/en/interfaces/third-party/client_libraries.md @@ -1,10 +1,10 @@ -# Libraries from Third-party Developers +# Client Libraries from Third-party Developers -We have not tested the libraries listed below. +!!! warning "Disclaimer" + Yandex does **not** maintain the libraries listed below and haven't done any extensive testing to ensure their quality. - Python - [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm) - - [sqlalchemy-clickhouse](https://github.com/cloudflare/sqlalchemy-clickhouse) - [clickhouse-driver](https://github.com/mymarilyn/clickhouse-driver) - [clickhouse-client](https://github.com/yurial/clickhouse-client) - [aiochclient](https://github.com/maximdanilchenko/aiochclient) @@ -30,23 +30,21 @@ We have not tested the libraries listed below. - R - [clickhouse-r](https://github.com/hannesmuehleisen/clickhouse-r) - [RClickhouse](https://github.com/IMSMWU/RClickhouse) +- Java + - [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java) - Scala - [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client) -- .NET +- Kotlin + - [AORM](https://github.com/TanVD/AORM) +- C# - [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net) - [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net) - - [ClickHouse.Net.Migrations](https://github.com/ilyabreev/ClickHouse.Net.Migrations) - C++ - [clickhouse-cpp](https://github.com/artpaul/clickhouse-cpp/) - Elixir - [clickhousex](https://github.com/appodeal/clickhousex/) - - [clickhouse_ecto](https://github.com/appodeal/clickhouse_ecto) -- Java - - [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java) -- Kotlin - - [AORM](https://github.com/TanVD/AORM) - Nim - [nim-clickhouse](https://github.com/leonardoce/nim-clickhouse) -[Original article](https://clickhouse.yandex/docs/en/interfaces/third-party_client_libraries/) +[Original article](https://clickhouse.yandex/docs/en/interfaces/third-party/client_libraries/) diff --git a/docs/en/interfaces/third-party_gui.md b/docs/en/interfaces/third-party/gui.md similarity index 100% rename from docs/en/interfaces/third-party_gui.md rename to docs/en/interfaces/third-party/gui.md diff --git a/docs/en/interfaces/third-party/integrations.md b/docs/en/interfaces/third-party/integrations.md new file mode 100644 index 00000000000..ece64d9dcb3 --- /dev/null +++ b/docs/en/interfaces/third-party/integrations.md @@ -0,0 +1,25 @@ +# Integration Libraries from Third-party Developers + +!!! warning "Disclaimer" + Yandex does **not** maintain the libraries listed below and haven't done any extensive testing to ensure their quality. + +- Python + - [SQLAlchemy](https://www.sqlalchemy.org) + - [sqlalchemy-clickhouse](https://github.com/cloudflare/sqlalchemy-clickhouse) (uses [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm)) +- Java + - [Hadoop](http://hadoop.apache.org) + - [clickhouse-hdfs-loader](https://github.com/jaykelin/clickhouse-hdfs-loader) (uses [JDBC](../jdbc.md)) +- Scala + - [Akka](https://akka.io) + - [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client) +- C# + - [ADO.NET](https://docs.microsoft.com/en-us/dotnet/framework/data/adonet/ado-net-overview) + - [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net) + - [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net) + - [ClickHouse.Net.Migrations](https://github.com/ilyabreev/ClickHouse.Net.Migrations) +- Elixir + - [Ecto](https://github.com/elixir-ecto/ecto) + - [clickhouse_ecto](https://github.com/appodeal/clickhouse_ecto) + + +[Original article](https://clickhouse.yandex/docs/en/interfaces/third-party/integrations/) \ No newline at end of file diff --git a/docs/en/operations/settings/permissions_for_queries.md b/docs/en/operations/settings/permissions_for_queries.md index 8c731ed1ce8..c65b35e60cc 100644 --- a/docs/en/operations/settings/permissions_for_queries.md +++ b/docs/en/operations/settings/permissions_for_queries.md @@ -33,7 +33,7 @@ See [above](#permissions_for_queries) for the division of queries into groups. After setting `readonly = 1`, a user can't change `readonly` and `allow_ddl` settings in the current session. -When using the `GET` method in the [HTTP interface](../../interfaces/http_interface.md#http_interface), `readonly = 1` is set automatically. To modify data use the `POST` method. +When using the `GET` method in the [HTTP interface](../../interfaces/http.md#http_interface), `readonly = 1` is set automatically. To modify data use the `POST` method. diff --git a/docs/en/operations/table_engines/custom_partitioning_key.md b/docs/en/operations/table_engines/custom_partitioning_key.md index 55940db8ca9..5bf686ea872 100644 --- a/docs/en/operations/table_engines/custom_partitioning_key.md +++ b/docs/en/operations/table_engines/custom_partitioning_key.md @@ -2,8 +2,6 @@ # Custom Partitioning Key -Starting with version 1.1.54310, you can create tables in the MergeTree family with any partitioning expression (not only partitioning by month). - The partition key can be an expression from the table columns, or a tuple of such expressions (similar to the primary key). The partition key can be omitted. When creating a table, specify the partition key in the ENGINE description with the new syntax: ``` diff --git a/docs/en/roadmap.md b/docs/en/roadmap.md index 490e570b659..46931d5983b 100644 --- a/docs/en/roadmap.md +++ b/docs/en/roadmap.md @@ -4,11 +4,23 @@ - JOIN syntax compatible with SQL standard: - Mutliple `JOIN`s in single `SELECT` +- Protobuf and Parquet input and output formats + +## Q1 2019 + +- Import/export from HDFS and S3 +- Lower metadata size in ZooKeeper +- Adaptive index granularity for MergeTree engine family + +## Q2 2019 - JOIN execution improvements: - Distributed join not limited by memory - -- Protobuf and Parquet input and output formats - Resource pools for more precise distribution of cluster capacity between users +## Q3 2019 + +- Fine-grained authorization +- Integration with external authentication services + [Original article](https://clickhouse.yandex/docs/en/roadmap/) diff --git a/docs/fa/interfaces/http_interface.md b/docs/fa/interfaces/http.md similarity index 100% rename from docs/fa/interfaces/http_interface.md rename to docs/fa/interfaces/http.md diff --git a/docs/fa/interfaces/index.md b/docs/fa/interfaces/index.md index d06c8ec8fd0..0c8914939a6 100644 --- a/docs/fa/interfaces/index.md +++ b/docs/fa/interfaces/index.md @@ -2,9 +2,22 @@
-# Interface ها +# رابط ها -برای کشف قابلیت های سیستم، دانلو داده ها به جداول، یا ساخت query های دستی، از برنامه clikhouse-client استفاده کنید. +ClickHouse دو اینترفیس شبکه را فراهم می کند (هر دو می توانند به صورت اختیاری در TLS برای امنیت اضافی پیچیده شوند): + +* [HTTP](http.md), که مستند شده و به راحتی به طور مستقیم استفاده می شود. +* [بومی TCP](tcp.md), که دارای سربار کمتر است. + +اگرچه در بیشتر موارد توصیه می شود از ابزار یا کتابخانه مناسب استفاده کنید تا به طور مستقیم با آن ها ارتباط برقرار نکنید. به طور رسمی توسط یانداکس پشتیبانی می شوند عبارتند از: +* [خط فرمان خط](cli.md) +* [راننده JDBC](jdbc.md) +* [راننده ODBC](odbc.md) + +همچنین برای کار با ClickHouse طیف گسترده ای از کتابخانه های شخص ثالث وجود دارد: +* [کتابخانه های مشتری](third-party/client_libraries.md) +* [ادغام](third-party/integrations.md) +* [رابط های بصری](third-party/gui.md)
[مقاله اصلی](https://clickhouse.yandex/docs/fa/interfaces/) diff --git a/docs/fa/interfaces/jdbc.md b/docs/fa/interfaces/jdbc.md index e72b5504c06..5cb82ff4274 100644 --- a/docs/fa/interfaces/jdbc.md +++ b/docs/fa/interfaces/jdbc.md @@ -5,10 +5,8 @@ درایور رسمی JDBC برای ClickHouse وجود دارد. برای اطلاعات بیشتر [اینجا](https://github.com/yandex/clickhouse-jdbc) را ببینید. -JDBC drivers implemented by other organizations: درایور JDBC توسط سازمان های دیگر اجرا می شوند. - - [ClickHouse-Native-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC) diff --git a/docs/fa/interfaces/odbc.md b/docs/fa/interfaces/odbc.md new file mode 100644 index 00000000000..692fc92651d --- /dev/null +++ b/docs/fa/interfaces/odbc.md @@ -0,0 +1,7 @@ +
+# ODBC درایور + +درایور رسمی ODBC برای ClickHouse وجود دارد. برای اطلاعات بیشتر [اینجا](https://github.com/yandex/clickhouse-odbc) را ببینید. + +
+[مقاله اصلی](https://clickhouse.yandex/docs/fa/interfaces/odbc/) diff --git a/docs/fa/interfaces/tcp.md b/docs/fa/interfaces/tcp.md index 5e767b876f8..bd902aedc58 100644 --- a/docs/fa/interfaces/tcp.md +++ b/docs/fa/interfaces/tcp.md @@ -1,8 +1,8 @@
-# Native interface (TCP) +# رابط بومی (TCP) -native interface در محیط ترمینال "clickhouse-client" برای تعامل بین سرور با پردازش query توزیع شده مورد استفاده قرار می گیرد. همچنین native interface در برنامه های C++ مورد استفاده قرار می گیرد. ما فقط کلاینت command-line را پوشش میدیم. +پروتکل بومی در [خط فرمان خط] (cli.md)، برای برقراری ارتباط بین سرور در طی پردازش پرس و جو توزیع شده، و همچنین در سایر برنامه های C ++ استفاده می شود. متاسفانه، پروتکل ClickHouse بومی هنوز مشخصات رسمی ندارد، اما می توان آن را از کد منبع ClickHouse (شروع [از اینجا](https://github.com/yandex/ClickHouse/tree/master/dbms/src/Client)) و / یا با رهگیری و تجزیه و تحلیل ترافیک TCP.
[مقاله اصلی](https://clickhouse.yandex/docs/fa/interfaces/tcp/) diff --git a/docs/fa/interfaces/third-party_client_libraries.md b/docs/fa/interfaces/third-party/client_libraries.md similarity index 81% rename from docs/fa/interfaces/third-party_client_libraries.md rename to docs/fa/interfaces/third-party/client_libraries.md index 3f6536ccf22..48034195fab 100644 --- a/docs/fa/interfaces/third-party_client_libraries.md +++ b/docs/fa/interfaces/third-party/client_libraries.md @@ -1,12 +1,12 @@
-# کتابخانه های توسعه دهندگان third-party +# کتابخانه های مشتری شخص ثالث -کتابخانه هایی برای کار با ClickHouse وجود دارد: +!!! warning "سلب مسئولیت" + Yandex نه حفظ کتابخانه ها در زیر ذکر شده و نشده انجام هر آزمایش های گسترده ای برای اطمینان از کیفیت آنها. - Python - [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm) - - [sqlalchemy-clickhouse](https://github.com/cloudflare/sqlalchemy-clickhouse) - [clickhouse-driver](https://github.com/mymarilyn/clickhouse-driver) - [clickhouse-client](https://github.com/yurial/clickhouse-client) - PHP @@ -31,21 +31,23 @@ - R - [clickhouse-r](https://github.com/hannesmuehleisen/clickhouse-r) - [RClickhouse](https://github.com/IMSMWU/RClickhouse) -- .NET +- Java + - [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java) +- Scala + - [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client) +- Kotlin + - [AORM](https://github.com/TanVD/AORM) +- C# - [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net) - [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net) - - [ClickHouse.Net.Migrations](https://github.com/ilyabreev/ClickHouse.Net.Migrations) - C++ - [clickhouse-cpp](https://github.com/artpaul/clickhouse-cpp/) - Elixir - [clickhousex](https://github.com/appodeal/clickhousex/) - - [clickhouse_ecto](https://github.com/appodeal/clickhouse_ecto) -- Java - - [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java) - Nim - [nim-clickhouse](https://github.com/leonardoce/nim-clickhouse) ما این کتابخانه ها را تست نکردیم. آنها به صورت تصادفی انتخاب شده اند.
-[مقاله اصلی](https://clickhouse.yandex/docs/fa/interfaces/third-party_client_libraries/) +[مقاله اصلی](https://clickhouse.yandex/docs/fa/interfaces/third-party/client_libraries/) diff --git a/docs/fa/interfaces/third-party_gui.md b/docs/fa/interfaces/third-party/gui.md similarity index 100% rename from docs/fa/interfaces/third-party_gui.md rename to docs/fa/interfaces/third-party/gui.md diff --git a/docs/fa/interfaces/third-party/integrations.md b/docs/fa/interfaces/third-party/integrations.md new file mode 100644 index 00000000000..08055497848 --- /dev/null +++ b/docs/fa/interfaces/third-party/integrations.md @@ -0,0 +1,27 @@ +
+ +# کتابخانه ادغام ثالث + +!!! warning "سلب مسئولیت" + Yandex نه حفظ کتابخانه ها در زیر ذکر شده و نشده انجام هر آزمایش های گسترده ای برای اطمینان از کیفیت آنها. + +- Python + - [SQLAlchemy](https://www.sqlalchemy.org) + - [sqlalchemy-clickhouse](https://github.com/cloudflare/sqlalchemy-clickhouse) (uses [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm)) +- Java + - [Hadoop](http://hadoop.apache.org) + - [clickhouse-hdfs-loader](https://github.com/jaykelin/clickhouse-hdfs-loader) (uses [JDBC](../jdbc.md)) +- Scala + - [Akka](https://akka.io) + - [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client) +- C# + - [ADO.NET](https://docs.microsoft.com/en-us/dotnet/framework/data/adonet/ado-net-overview) + - [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net) + - [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net) + - [ClickHouse.Net.Migrations](https://github.com/ilyabreev/ClickHouse.Net.Migrations) +- Elixir + - [Ecto](https://github.com/elixir-ecto/ecto) + - [clickhouse_ecto](https://github.com/appodeal/clickhouse_ecto) + +
+[مقاله اصلی](https://clickhouse.yandex/docs/fa/interfaces/third-party/integrations/) diff --git a/docs/fa/introduction/features_considered_disadvantages.md b/docs/fa/introduction/features_considered_disadvantages.md index 3a963d05140..f6066bbeadf 100644 --- a/docs/fa/introduction/features_considered_disadvantages.md +++ b/docs/fa/introduction/features_considered_disadvantages.md @@ -3,7 +3,7 @@ # ویژگی های از ClickHouse که می تواند معایبی باشد. 1. بدون پشتیبانی کامل از تراکنش -2. عدم توانایی در تغییر و یا حذف داده های insert شده با rate بالا و latency کم. روشی برای پاک کردن دسته ای داده ها و یا مطابق با قوانین [GDPR](https://gdpr-info.eu) وجود دارد. بروزرسانی دسته ای از July 2018 در حال توسعه می باشد. +2. عدم توانایی برای تغییر و یا حذف داده های در حال حاضر وارد شده با سرعت بالا و تاخیر کم. برای پاک کردن و یا اصلاح داده ها، به عنوان مثال برای پیروی از [GDPR](https://gdpr-info.eu)، دسته ای پاک و به روزرسانی وجود دارد.حال توسعه می باشد. 3. Sparse index باعث می شود ClickHouse چندان مناسب اجرای پرسمان های point query برای دریافت یک ردیف از داده ها با استفاده از کلید آنها نباشد. diff --git a/docs/fa/query_language/functions/functions_for_nulls.md b/docs/fa/query_language/functions/functions_for_nulls.md new file mode 120000 index 00000000000..fa57e10ad15 --- /dev/null +++ b/docs/fa/query_language/functions/functions_for_nulls.md @@ -0,0 +1 @@ +../../../en/query_language/functions/functions_for_nulls.md \ No newline at end of file diff --git a/docs/fa/query_language/functions/geo.md b/docs/fa/query_language/functions/geo.md new file mode 120000 index 00000000000..86fa3a85d34 --- /dev/null +++ b/docs/fa/query_language/functions/geo.md @@ -0,0 +1 @@ +../../../en/query_language/functions/geo.md \ No newline at end of file diff --git a/docs/redirects.txt b/docs/redirects.txt index f9473c69d94..be807dd547d 100644 --- a/docs/redirects.txt +++ b/docs/redirects.txt @@ -116,3 +116,6 @@ table_functions/numbers.md query_language/table_functions/numbers.md table_functions/remote.md query_language/table_functions/remote.md query_language/queries.md query_language.md introduction/possible_silly_questions.md faq/general.md +interfaces/third-party_client_libraries.md interfaces/third-party/client_libraries.md +interfaces/third-party_gui.md interfaces/third-party/gui.md +interfaces/http_interface.md interfaces/http.md diff --git a/docs/ru/interfaces/http_interface.md b/docs/ru/interfaces/http.md similarity index 100% rename from docs/ru/interfaces/http_interface.md rename to docs/ru/interfaces/http.md diff --git a/docs/ru/interfaces/index.md b/docs/ru/interfaces/index.md index 4560cda1fb7..bc3b1f2bd79 100644 --- a/docs/ru/interfaces/index.md +++ b/docs/ru/interfaces/index.md @@ -2,6 +2,19 @@ # Интерфейсы -Для изучения возможностей системы, загрузки данных в таблицы, ручных запросов, используйте программу clickhouse-client. +ClickHouse предоставляет два сетевых интерфейса (оба могут быть дополнительно обернуты в TLS для дополнительной безопасности): + +* [HTTP](http.md), который задокументирован и прост для использования напрямую; +* [Native TCP](tcp.md), который имеет меньше накладных расходов. + +В большинстве случаев рекомендуется использовать подходящий инструмент или библиотеку, а не напрямую взаимодействовать с ClickHouse по сути. Официально поддерживаемые Яндексом: +* [Консольный клиент](cli.md); +* [JDBC-драйвер](jdbc.md); +* [ODBC-драйвер](odbc.md). + +Существует также широкий спектр сторонних библиотек для работы с ClickHouse: +* [Клиентские библиотеки](third-party/client_libraries.md); +* [Библиотеки для интеграции](third-party/integrations.md); +* [Визуальные интерфейсы](third-party/gui.md). [Оригинальная статья](https://clickhouse.yandex/docs/ru/interfaces/) diff --git a/docs/ru/interfaces/odbc.md b/docs/ru/interfaces/odbc.md new file mode 100644 index 00000000000..9feb43f13ea --- /dev/null +++ b/docs/ru/interfaces/odbc.md @@ -0,0 +1,5 @@ +# ODBC-драйвер + +- [Официальный драйвер](https://github.com/yandex/clickhouse-jdbc). + +[Оригинальная статья](https://clickhouse.yandex/docs/ru/interfaces/odbc/) diff --git a/docs/ru/interfaces/tcp.md b/docs/ru/interfaces/tcp.md index 98672b505e4..da0ea735644 100644 --- a/docs/ru/interfaces/tcp.md +++ b/docs/ru/interfaces/tcp.md @@ -1,5 +1,5 @@ # Родной интерфейс (TCP) -Родной интерфейс используется в клиенте командной строки clickhouse-client, при межсерверном взаимодействии для распределённой обработки запроса, а также в программах на C++. Будет рассмотрен только клиент командной строки. +Нативный протокол используется в [клиенте командной строки](cli.md), для взаимодействия между серверами во время обработки распределенных запросов, а также в других программах на C++. К сожалению, у родного протокола ClickHouse пока нет формальной спецификации, но в нем можно разобраться с использованием исходного кода ClickHouse (начиная с [примерно этого места](https://github.com/yandex/ClickHouse/tree/master/dbms/src/Client)) и/или путем перехвата и анализа TCP трафика. [Оригинальная статья](https://clickhouse.yandex/docs/ru/interfaces/tcp/) diff --git a/docs/ru/interfaces/third-party_client_libraries.md b/docs/ru/interfaces/third-party/client_libraries.md similarity index 81% rename from docs/ru/interfaces/third-party_client_libraries.md rename to docs/ru/interfaces/third-party/client_libraries.md index 6cebd98271d..562b863922e 100644 --- a/docs/ru/interfaces/third-party_client_libraries.md +++ b/docs/ru/interfaces/third-party/client_libraries.md @@ -1,10 +1,10 @@ -# Библиотеки от сторонних разработчиков +# Клиентские библиотеки от сторонних разработчиков -Мы не тестировали перечисленные ниже библиотеки. +!!! warning "Disclaimer" + Яндекс не поддерживает перечисленные ниже библиотеки и не проводит тщательного тестирования для проверки их качества. - Python: - [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm) - - [sqlalchemy-clickhouse](https://github.com/cloudflare/sqlalchemy-clickhouse) - [clickhouse-driver](https://github.com/mymarilyn/clickhouse-driver) - [clickhouse-client](https://github.com/yurial/clickhouse-client) - [aiochclient](https://github.com/maximdanilchenko/aiochclient) @@ -30,22 +30,20 @@ - R - [clickhouse-r](https://github.com/hannesmuehleisen/clickhouse-r) - [RClickhouse](https://github.com/IMSMWU/RClickhouse) +- Java + - [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java) - Scala - [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client) -- .NET +- Kotlin + - [AORM](https://github.com/TanVD/AORM) +- C# - [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net) - [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net) - - [ClickHouse.Net.Migrations](https://github.com/ilyabreev/ClickHouse.Net.Migrations) - C++ - [clickhouse-cpp](https://github.com/artpaul/clickhouse-cpp/) - Elixir - [clickhousex](https://github.com/appodeal/clickhousex/) - - [clickhouse_ecto](https://github.com/appodeal/clickhouse_ecto) -- Java - - [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java) -- Kotlin - - [AORM](https://github.com/TanVD/AORM) - Nim - [nim-clickhouse](https://github.com/leonardoce/nim-clickhouse) -[Оригинальная статья](https://clickhouse.yandex/docs/ru/interfaces/third-party_client_libraries/) +[Оригинальная статья](https://clickhouse.yandex/docs/ru/interfaces/third-party/client_libraries/) diff --git a/docs/ru/interfaces/third-party_gui.md b/docs/ru/interfaces/third-party/gui.md similarity index 100% rename from docs/ru/interfaces/third-party_gui.md rename to docs/ru/interfaces/third-party/gui.md diff --git a/docs/ru/interfaces/third-party/integrations.md b/docs/ru/interfaces/third-party/integrations.md new file mode 100644 index 00000000000..e86a9fb20a8 --- /dev/null +++ b/docs/ru/interfaces/third-party/integrations.md @@ -0,0 +1,24 @@ +# Библиотеки для интеграции от сторонних разработчиков + +!!! warning "Disclaimer" + Яндекс не поддерживает перечисленные ниже библиотеки и не проводит тщательного тестирования для проверки их качества. + +- Python + - [SQLAlchemy](https://www.sqlalchemy.org) + - [sqlalchemy-clickhouse](https://github.com/cloudflare/sqlalchemy-clickhouse) (uses [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm)) +- Java + - [Hadoop](http://hadoop.apache.org) + - [clickhouse-hdfs-loader](https://github.com/jaykelin/clickhouse-hdfs-loader) (uses [JDBC](../jdbc.md)) +- Scala + - [Akka](https://akka.io) + - [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client) +- C# + - [ADO.NET](https://docs.microsoft.com/en-us/dotnet/framework/data/adonet/ado-net-overview) + - [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net) + - [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net) + - [ClickHouse.Net.Migrations](https://github.com/ilyabreev/ClickHouse.Net.Migrations) +- Elixir + - [Ecto](https://github.com/elixir-ecto/ecto) + - [clickhouse_ecto](https://github.com/appodeal/clickhouse_ecto) + +[Оригинальная статья](https://clickhouse.yandex/docs/ru/interfaces/third-party/integrations/) diff --git a/docs/ru/introduction/features_considered_disadvantages.md b/docs/ru/introduction/features_considered_disadvantages.md index 9e04f747c10..f7425efa4b3 100644 --- a/docs/ru/introduction/features_considered_disadvantages.md +++ b/docs/ru/introduction/features_considered_disadvantages.md @@ -1,7 +1,7 @@ # Особенности ClickHouse, которые могут считаться недостатками 1. Отсутствие полноценных транзакций. -2. Возможность изменять или удалять ранее записанные данные с низкими задержками и высокой частотой запросов не предоставляется. Есть массовое удаление данных для очистки более не нужного или соответствия [GDPR](https://gdpr-info.eu). Массовое изменение данных находится в разработке (на момент июля 2018). +2. Возможность изменять или удалять ранее записанные данные с низкими задержками и высокой частотой запросов не предоставляется. Есть массовое удаление и изменение данных для очистки более не нужного или соответствия [GDPR](https://gdpr-info.eu). 3. Разреженный индекс делает ClickHouse плохо пригодным для точечных чтений одиночных строк по своим ключам. diff --git a/docs/ru/operations/table_engines/custom_partitioning_key.md b/docs/ru/operations/table_engines/custom_partitioning_key.md index 8d228f5c498..6aa3cad3d0f 100644 --- a/docs/ru/operations/table_engines/custom_partitioning_key.md +++ b/docs/ru/operations/table_engines/custom_partitioning_key.md @@ -2,8 +2,6 @@ # Произвольный ключ партиционирования -Начиная с версии 1.1.54310 доступна возможность создания таблиц семейства MergeTree с произвольным выражением партиционирования (не только по месяцу). - Ключ партиционирования может представлять собой произвольное выражение из столбцов таблицы, а также кортеж из таких выражений (аналогично первичному ключу). Ключ партиционирования может отсутствовать. При создании таблицы ключ партиционирования указывается в описании движка (ENGINE) с новым синтаксисом: ``` diff --git a/docs/ru/roadmap.md b/docs/ru/roadmap.md deleted file mode 100644 index 5418cf8a8b1..00000000000 --- a/docs/ru/roadmap.md +++ /dev/null @@ -1,14 +0,0 @@ -# Roadmap - -## Q4 2018 - -- Соответствующий SQL стандарту синтаксис JOIN: - - Несколько `JOIN`ов в одном `SELECT` - -- Улучшения в исполнении JOIN: - - Распределённый JOIN, не ограниченный оперативной памятью - -- Добавление Protobuf и Parquet к ассортименту поддерживаемых форматов ввода-вывода -- Пулы ресурсов для более точного распределения мощностей кластера между его пользователями - -[Оригинальная статья](https://clickhouse.yandex/docs/ru/roadmap/) diff --git a/docs/ru/roadmap.md b/docs/ru/roadmap.md new file mode 120000 index 00000000000..24df86352b3 --- /dev/null +++ b/docs/ru/roadmap.md @@ -0,0 +1 @@ +../en/roadmap.md \ No newline at end of file diff --git a/docs/toc_en.yml b/docs/toc_en.yml index ec4ae4e8619..6e9a252e84e 100644 --- a/docs/toc_en.yml +++ b/docs/toc_en.yml @@ -2,37 +2,40 @@ nav: - 'Introduction': - 'Overview': 'index.md' - - 'Distinctive features of ClickHouse': 'introduction/distinctive_features.md' - - 'ClickHouse features that can be considered disadvantages': 'introduction/features_considered_disadvantages.md' + - 'Distinctive Features of ClickHouse': 'introduction/distinctive_features.md' + - 'ClickHouse Features that Can Be Considered Disadvantages': 'introduction/features_considered_disadvantages.md' - 'Performance': 'introduction/performance.md' - - 'The Yandex.Metrica task': 'introduction/ya_metrika_task.md' + - 'The Yandex.Metrica Task': 'introduction/ya_metrika_task.md' -- 'Getting started': - - 'Deploying and running': 'getting_started/index.md' - - 'Example datasets': +- 'Getting Started': + - 'Deploying and Running': 'getting_started/index.md' + - 'Example Datasets': - 'OnTime': 'getting_started/example_datasets/ontime.md' - - 'New York Taxi data': 'getting_started/example_datasets/nyc_taxi.md' + - 'New York Taxi Data': 'getting_started/example_datasets/nyc_taxi.md' - 'AMPLab Big Data Benchmark': 'getting_started/example_datasets/amplab_benchmark.md' - 'WikiStat': 'getting_started/example_datasets/wikistat.md' - - 'Terabyte click logs from Criteo': 'getting_started/example_datasets/criteo.md' + - 'Terabyte Click Logs from Criteo': 'getting_started/example_datasets/criteo.md' - 'Star Schema Benchmark': 'getting_started/example_datasets/star_schema.md' - 'Interfaces': - 'Introduction': 'interfaces/index.md' - - 'Command-line client': 'interfaces/cli.md' - - 'HTTP interface': 'interfaces/http_interface.md' - - 'JDBC driver': 'interfaces/jdbc.md' - - 'Native interface (TCP)': 'interfaces/tcp.md' - - 'Libraries from third-party developers': 'interfaces/third-party_client_libraries.md' - - 'Visual interfaces from third-party developers': 'interfaces/third-party_gui.md' - - 'Input and output formats': 'interfaces/formats.md' + - 'Command-Line Client': 'interfaces/cli.md' + - 'Native Interface (TCP)': 'interfaces/tcp.md' + - 'HTTP Interface': 'interfaces/http.md' + - 'Input and Output Formats': 'interfaces/formats.md' + - 'JDBC Driver': 'interfaces/jdbc.md' + - 'ODBC Driver': 'interfaces/odbc.md' + - 'Third-Party': + - 'Client Libraries': 'interfaces/third-party/client_libraries.md' + - 'Integrations': 'interfaces/third-party/integrations.md' + - 'Visual Interfaces': 'interfaces/third-party/gui.md' -- 'Data types': +- 'Data Types': - 'Introduction': 'data_types/index.md' - 'UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64': 'data_types/int_uint.md' - 'Float32, Float64': 'data_types/float.md' - 'Decimal': 'data_types/decimal.md' - - 'Boolean values': 'data_types/boolean.md' + - 'Boolean': 'data_types/boolean.md' - 'String': 'data_types/string.md' - 'FixedString(N)': 'data_types/fixedstring.md' - 'Date': 'data_types/date.md' @@ -42,58 +45,58 @@ nav: - 'AggregateFunction(name, types_of_arguments...)': 'data_types/nested_data_structures/aggregatefunction.md' - 'Tuple(T1, T2, ...)': 'data_types/tuple.md' - 'Nullable': 'data_types/nullable.md' - - 'Nested data structures': + - 'Nested Data Structures': - 'hidden': 'data_types/nested_data_structures/index.md' - 'Nested(Name1 Type1, Name2 Type2, ...)': 'data_types/nested_data_structures/nested.md' - - 'Special data types': + - 'Special Data Types': - 'hidden': 'data_types/special_data_types/index.md' - 'Expression': 'data_types/special_data_types/expression.md' - 'Set': 'data_types/special_data_types/set.md' - 'Nothing': 'data_types/special_data_types/nothing.md' -- 'SQL reference': +- 'SQL Reference': - 'hidden': 'query_language/index.md' - 'SELECT': 'query_language/select.md' - 'INSERT INTO': 'query_language/insert_into.md' - 'CREATE': 'query_language/create.md' - 'ALTER': 'query_language/alter.md' - - 'Other kinds of queries': 'query_language/misc.md' + - 'Other Kinds of Queries': 'query_language/misc.md' - 'Functions': - 'Introduction': 'query_language/functions/index.md' - - 'Arithmetic functions': 'query_language/functions/arithmetic_functions.md' - - 'Comparison functions': 'query_language/functions/comparison_functions.md' - - 'Logical functions': 'query_language/functions/logical_functions.md' - - 'Type conversion functions': 'query_language/functions/type_conversion_functions.md' - - 'Functions for working with dates and times': 'query_language/functions/date_time_functions.md' - - 'Functions for working with strings': 'query_language/functions/string_functions.md' - - 'Functions for searching strings': 'query_language/functions/string_search_functions.md' - - 'Functions for searching and replacing in strings': 'query_language/functions/string_replace_functions.md' - - 'Conditional functions': 'query_language/functions/conditional_functions.md' - - 'Mathematical functions': 'query_language/functions/math_functions.md' - - 'Rounding functions': 'query_language/functions/rounding_functions.md' - - 'Functions for working with arrays': 'query_language/functions/array_functions.md' - - 'Functions for splitting and merging strings and arrays': 'query_language/functions/splitting_merging_functions.md' - - 'Bit functions': 'query_language/functions/bit_functions.md' - - 'Hash functions': 'query_language/functions/hash_functions.md' - - 'Functions for generating pseudo-random numbers': 'query_language/functions/random_functions.md' - - 'Encoding functions': 'query_language/functions/encoding_functions.md' - - 'Functions for working with URLs': 'query_language/functions/url_functions.md' - - 'Functions for working with IP addresses': 'query_language/functions/ip_address_functions.md' - - 'Functions for working with JSON.': 'query_language/functions/json_functions.md' - - 'Higher-order functions': 'query_language/functions/higher_order_functions.md' - - 'Other functions': 'query_language/functions/other_functions.md' - - 'Functions for working with external dictionaries': 'query_language/functions/ext_dict_functions.md' - - 'Functions for working with Yandex.Metrica dictionaries': 'query_language/functions/ym_dict_functions.md' - - 'Functions for implementing the IN operator': 'query_language/functions/in_functions.md' - - 'arrayJoin function': 'query_language/functions/array_join.md' - - 'Functions for working with geographical coordinates': 'query_language/functions/geo.md' - - 'Functions for working with Nullable arguments': 'query_language/functions/functions_for_nulls.md' - - 'Aggregate functions': + - 'Arithmetic': 'query_language/functions/arithmetic_functions.md' + - 'Comparison': 'query_language/functions/comparison_functions.md' + - 'Logical': 'query_language/functions/logical_functions.md' + - 'Type Conversion': 'query_language/functions/type_conversion_functions.md' + - 'Working with Dates and Times': 'query_language/functions/date_time_functions.md' + - 'Working with strings': 'query_language/functions/string_functions.md' + - 'For Searching Strings': 'query_language/functions/string_search_functions.md' + - 'For Replacing in Strings': 'query_language/functions/string_replace_functions.md' + - 'Conditional ': 'query_language/functions/conditional_functions.md' + - 'Mathematical': 'query_language/functions/math_functions.md' + - 'Rounding': 'query_language/functions/rounding_functions.md' + - 'Working with Arrays': 'query_language/functions/array_functions.md' + - 'Splitting and Merging Strings and Arrays': 'query_language/functions/splitting_merging_functions.md' + - 'Bit': 'query_language/functions/bit_functions.md' + - 'Hash': 'query_language/functions/hash_functions.md' + - 'Generating Pseudo-Random Numbers': 'query_language/functions/random_functions.md' + - 'Encoding': 'query_language/functions/encoding_functions.md' + - 'Working with URLs': 'query_language/functions/url_functions.md' + - 'Working with IP Addresses': 'query_language/functions/ip_address_functions.md' + - 'Working with JSON.': 'query_language/functions/json_functions.md' + - 'Higher-Order': 'query_language/functions/higher_order_functions.md' + - 'Working with External Dictionaries': 'query_language/functions/ext_dict_functions.md' + - 'Working with Yandex.Metrica Dictionaries': 'query_language/functions/ym_dict_functions.md' + - 'Implementing the IN Operator': 'query_language/functions/in_functions.md' + - 'arrayJoin': 'query_language/functions/array_join.md' + - 'Working with geographical coordinates': 'query_language/functions/geo.md' + - 'Working with Nullable arguments': 'query_language/functions/functions_for_nulls.md' + - 'Other': 'query_language/functions/other_functions.md' + - 'Aggregate Functions': - 'Introduction': 'query_language/agg_functions/index.md' - - 'Function reference': 'query_language/agg_functions/reference.md' + - 'Reference': 'query_language/agg_functions/reference.md' - 'Aggregate function combinators': 'query_language/agg_functions/combinators.md' - 'Parametric aggregate functions': 'query_language/agg_functions/parametric_functions.md' - - 'Table functions': + - 'Table Functions': - 'Introduction': 'query_language/table_functions/index.md' - 'file': 'query_language/table_functions/file.md' - 'merge': 'query_language/table_functions/merge.md' @@ -103,31 +106,31 @@ nav: - 'jdbc': 'query_language/table_functions/jdbc.md' - 'Dictionaries': - 'Introduction': 'query_language/dicts/index.md' - - 'External dictionaries': - - 'General description': 'query_language/dicts/external_dicts.md' - - 'Configuring an external dictionary': 'query_language/dicts/external_dicts_dict.md' - - 'Storing dictionaries in memory': 'query_language/dicts/external_dicts_dict_layout.md' - - 'Dictionary updates': 'query_language/dicts/external_dicts_dict_lifetime.md' - - 'Sources of external dictionaries': 'query_language/dicts/external_dicts_dict_sources.md' - - 'Dictionary key and fields': 'query_language/dicts/external_dicts_dict_structure.md' - - 'Internal dictionaries': 'query_language/dicts/internal_dicts.md' + - 'External Dictionaries': + - 'General Description': 'query_language/dicts/external_dicts.md' + - 'Configuring an External Dictionary': 'query_language/dicts/external_dicts_dict.md' + - 'Storing Dictionaries in Memory': 'query_language/dicts/external_dicts_dict_layout.md' + - 'Dictionary Updates': 'query_language/dicts/external_dicts_dict_lifetime.md' + - 'Sources of External Dictionaries': 'query_language/dicts/external_dicts_dict_sources.md' + - 'Dictionary Key and Fields': 'query_language/dicts/external_dicts_dict_structure.md' + - 'Internal Dictionaries': 'query_language/dicts/internal_dicts.md' - 'Operators': 'query_language/operators.md' - - 'General syntax': 'query_language/syntax.md' + - 'General Syntax': 'query_language/syntax.md' - 'Operations': - 'hidden': 'operations/index.md' - - 'Table engines': + - 'Table Engines': - 'Introduction': 'operations/table_engines/index.md' - - 'MergeTree family': + - 'MergeTree Family': - 'MergeTree': 'operations/table_engines/mergetree.md' - - 'Data replication': 'operations/table_engines/replication.md' - - 'Custom partitioning key': 'operations/table_engines/custom_partitioning_key.md' + - 'Data Replication': 'operations/table_engines/replication.md' + - 'Custom Partitioning Key': 'operations/table_engines/custom_partitioning_key.md' - 'ReplacingMergeTree': 'operations/table_engines/replacingmergetree.md' - 'SummingMergeTree': 'operations/table_engines/summingmergetree.md' - 'AggregatingMergeTree': 'operations/table_engines/aggregatingmergetree.md' - 'CollapsingMergeTree': 'operations/table_engines/collapsingmergetree.md' - 'GraphiteMergeTree': 'operations/table_engines/graphitemergetree.md' - - 'For small data': + - 'For Small Data': - 'TinyLog': 'operations/table_engines/tinylog.md' - 'Log': 'operations/table_engines/log.md' - 'Memory': 'operations/table_engines/memory.md' @@ -147,37 +150,37 @@ nav: - 'Integrations': - 'Kafka': 'operations/table_engines/kafka.md' - 'MySQL': 'operations/table_engines/mysql.md' - - 'Access rights': 'operations/access_rights.md' - - 'Configuration files': 'operations/configuration_files.md' + - 'Access Rights': 'operations/access_rights.md' + - 'Configuration Files': 'operations/configuration_files.md' - 'Quotas': 'operations/quotas.md' - - 'System tables': 'operations/system_tables.md' - - 'Usage recommendations': 'operations/tips.md' - - 'Server configuration parameters': + - 'System Tables': 'operations/system_tables.md' + - 'Usage Recommendations': 'operations/tips.md' + - 'Server Configuration Parameters': - 'Introduction': 'operations/server_settings/index.md' - - 'Server settings': 'operations/server_settings/settings.md' + - 'Server Settings': 'operations/server_settings/settings.md' - 'Settings': - 'Introduction': 'operations/settings/index.md' - - 'Permissions for queries': 'operations/settings/permissions_for_queries.md' - - 'Restrictions on query complexity': 'operations/settings/query_complexity.md' + - 'Permissions for Queries': 'operations/settings/permissions_for_queries.md' + - 'Restrictions on Query Complexity': 'operations/settings/query_complexity.md' - 'Settings': 'operations/settings/settings.md' - - 'Settings profiles': 'operations/settings/settings_profiles.md' + - 'Settings Profiles': 'operations/settings/settings_profiles.md' - 'Utilities': - 'Overview': 'operations/utils/index.md' - 'clickhouse-copier': 'operations/utils/clickhouse-copier.md' - 'clickhouse-local': 'operations/utils/clickhouse-local.md' - 'F.A.Q.': - - 'General questions': 'faq/general.md' + - 'General Questions': 'faq/general.md' - 'Development': - 'hidden': 'development/index.md' - - 'Overview of ClickHouse architecture': 'development/architecture.md' - - 'How to build ClickHouse on Linux': 'development/build.md' - - 'How to build ClickHouse on Mac OS X': 'development/build_osx.md' - - 'How to write C++ code': 'development/style.md' - - 'How to run ClickHouse tests': 'development/tests.md' + - 'Overview of ClickHouse Architecture': 'development/architecture.md' + - 'How to Build ClickHouse on Linux': 'development/build.md' + - 'How to Build ClickHouse on Mac OS X': 'development/build_osx.md' + - 'How to Write C++ code': 'development/style.md' + - 'How to Run ClickHouse Tests': 'development/tests.md' -- 'What''s new': +- 'What''s New': - 'Roadmap': 'roadmap.md' - 'Changelog': 'changelog.md' - - 'Security changelog': 'security_changelog.md' + - 'Security Changelog': 'security_changelog.md' diff --git a/docs/toc_fa.yml b/docs/toc_fa.yml index bf10398ce85..cc0aa901c1a 100644 --- a/docs/toc_fa.yml +++ b/docs/toc_fa.yml @@ -20,12 +20,15 @@ nav: - 'Interfaces': - 'Interface ها': 'interfaces/index.md' - ' کلاینت Command-line': 'interfaces/cli.md' - - 'HTTP interface': 'interfaces/http_interface.md' - - ' درایور JDBC': 'interfaces/jdbc.md' - 'Native interface (TCP)': 'interfaces/tcp.md' - - ' کتابخانه های توسعه دهندگان third-party': 'interfaces/third-party_client_libraries.md' - - 'interface های visual توسعه دهندگان third-party': 'interfaces/third-party_gui.md' + - 'HTTP interface': 'interfaces/http.md' - ' فرمت های Input و Output': 'interfaces/formats.md' + - ' درایور JDBC': 'interfaces/jdbc.md' + - ' درایور ODBC': 'interfaces/odbc.md' + - 'Third-party': + - 'کتابخانه های مشتری': 'interfaces/third-party/client_libraries.md' + - 'یکپارچگی': 'interfaces/third-party/integrations.md' + - 'رابط های بصری': 'interfaces/third-party/gui.md' - 'Data types': - 'Introduction': 'data_types/index.md' @@ -59,32 +62,34 @@ nav: - 'Other kinds of queries': 'query_language/misc.md' - 'Functions': - 'Introduction': 'query_language/functions/index.md' - - 'Arithmetic functions': 'query_language/functions/arithmetic_functions.md' - - 'Comparison functions': 'query_language/functions/comparison_functions.md' - - 'Logical functions': 'query_language/functions/logical_functions.md' - - 'Type conversion functions': 'query_language/functions/type_conversion_functions.md' - - 'Functions for working with dates and times': 'query_language/functions/date_time_functions.md' - - 'Functions for working with strings': 'query_language/functions/string_functions.md' - - 'Functions for searching strings': 'query_language/functions/string_search_functions.md' - - 'Functions for searching and replacing in strings': 'query_language/functions/string_replace_functions.md' - - 'Conditional functions': 'query_language/functions/conditional_functions.md' - - 'Mathematical functions': 'query_language/functions/math_functions.md' - - 'Rounding functions': 'query_language/functions/rounding_functions.md' - - 'Functions for working with arrays': 'query_language/functions/array_functions.md' - - 'Functions for splitting and merging strings and arrays': 'query_language/functions/splitting_merging_functions.md' - - 'Bit functions': 'query_language/functions/bit_functions.md' - - 'Hash functions': 'query_language/functions/hash_functions.md' - - 'Functions for generating pseudo-random numbers': 'query_language/functions/random_functions.md' - - 'Encoding functions': 'query_language/functions/encoding_functions.md' - - 'Functions for working with URLs': 'query_language/functions/url_functions.md' - - 'Functions for working with IP addresses': 'query_language/functions/ip_address_functions.md' - - 'Functions for working with JSON.': 'query_language/functions/json_functions.md' - - 'Higher-order functions': 'query_language/functions/higher_order_functions.md' - - 'Other functions': 'query_language/functions/other_functions.md' - - 'Functions for working with external dictionaries': 'query_language/functions/ext_dict_functions.md' - - 'Functions for working with Yandex.Metrica dictionaries': 'query_language/functions/ym_dict_functions.md' - - 'Functions for implementing the IN operator': 'query_language/functions/in_functions.md' - - 'arrayJoin function': 'query_language/functions/array_join.md' + - 'Arithmetic': 'query_language/functions/arithmetic_functions.md' + - 'Comparison': 'query_language/functions/comparison_functions.md' + - 'Logical': 'query_language/functions/logical_functions.md' + - 'Type Conversion': 'query_language/functions/type_conversion_functions.md' + - 'Working with Dates and Times': 'query_language/functions/date_time_functions.md' + - 'Working with strings': 'query_language/functions/string_functions.md' + - 'For Searching Strings': 'query_language/functions/string_search_functions.md' + - 'For Replacing in Strings': 'query_language/functions/string_replace_functions.md' + - 'Conditional ': 'query_language/functions/conditional_functions.md' + - 'Mathematical': 'query_language/functions/math_functions.md' + - 'Rounding': 'query_language/functions/rounding_functions.md' + - 'Working with Arrays': 'query_language/functions/array_functions.md' + - 'Splitting and Merging Strings and Arrays': 'query_language/functions/splitting_merging_functions.md' + - 'Bit': 'query_language/functions/bit_functions.md' + - 'Hash': 'query_language/functions/hash_functions.md' + - 'Generating Pseudo-Random Numbers': 'query_language/functions/random_functions.md' + - 'Encoding': 'query_language/functions/encoding_functions.md' + - 'Working with URLs': 'query_language/functions/url_functions.md' + - 'Working with IP Addresses': 'query_language/functions/ip_address_functions.md' + - 'Working with JSON.': 'query_language/functions/json_functions.md' + - 'Higher-Order': 'query_language/functions/higher_order_functions.md' + - 'Working with External Dictionaries': 'query_language/functions/ext_dict_functions.md' + - 'Working with Yandex.Metrica Dictionaries': 'query_language/functions/ym_dict_functions.md' + - 'Implementing the IN Operator': 'query_language/functions/in_functions.md' + - 'arrayJoin': 'query_language/functions/array_join.md' + - 'Working with geographical coordinates': 'query_language/functions/geo.md' + - 'Working with Nullable arguments': 'query_language/functions/functions_for_nulls.md' + - 'Other': 'query_language/functions/other_functions.md' - 'Aggregate functions': - 'Introduction': 'query_language/agg_functions/index.md' - 'Function reference': 'query_language/agg_functions/reference.md' diff --git a/docs/toc_ru.yml b/docs/toc_ru.yml index 00003aa9359..b4f4d60fd93 100644 --- a/docs/toc_ru.yml +++ b/docs/toc_ru.yml @@ -20,12 +20,15 @@ nav: - 'Интерфейсы': - 'Введение': 'interfaces/index.md' - 'Клиент командной строки': 'interfaces/cli.md' - - 'HTTP-интерфейс': 'interfaces/http_interface.md' - - 'JDBC-драйвер': 'interfaces/jdbc.md' - - 'Родной интерфейс (TCP)': 'interfaces/tcp.md' - - 'Библиотеки от сторонних разработчиков': 'interfaces/third-party_client_libraries.md' - - 'Визуальные интерфейсы от сторонних разработчиков': 'interfaces/third-party_gui.md' + - 'Нативный интерфейс (TCP)': 'interfaces/tcp.md' + - 'HTTP-интерфейс': 'interfaces/http.md' - 'Форматы входных и выходных данных': 'interfaces/formats.md' + - 'JDBC-драйвер': 'interfaces/jdbc.md' + - 'ODBC-драйвер': 'interfaces/odbc.md' + - 'От сторонних разработчиков': + - 'Клиентские библиотеки': 'interfaces/third-party/client_libraries.md' + - 'Интеграции': 'interfaces/third-party/integrations.md' + - 'Визуальные интерфейсы': 'interfaces/third-party/gui.md' - 'Типы данных': - 'Введение': 'data_types/index.md' @@ -81,14 +84,13 @@ nav: - 'Функции для работы с IP-адресами': 'query_language/functions/ip_address_functions.md' - 'Функции для работы с JSON.': 'query_language/functions/json_functions.md' - 'Функции высшего порядка': 'query_language/functions/higher_order_functions.md' - - 'Прочие функции': 'query_language/functions/other_functions.md' - 'Функции для работы с внешними словарями': 'query_language/functions/ext_dict_functions.md' - 'Функции для работы со словарями Яндекс.Метрики': 'query_language/functions/ym_dict_functions.md' - 'Функции для реализации оператора IN.': 'query_language/functions/in_functions.md' - 'Функция arrayJoin': 'query_language/functions/array_join.md' - 'Функции для работы с географическими координатами': 'query_language/functions/geo.md' - 'Функции c Nullable агрументами': 'query_language/functions/functions_for_nulls.md' - + - 'Прочие функции': 'query_language/functions/other_functions.md' - 'Агрегатные функции': - 'Введение': 'query_language/agg_functions/index.md' - 'Справочник функций': 'query_language/agg_functions/reference.md' diff --git a/docs/toc_zh.yml b/docs/toc_zh.yml index 3b5a3d2756e..dd2811223af 100644 --- a/docs/toc_zh.yml +++ b/docs/toc_zh.yml @@ -20,12 +20,15 @@ nav: - '客户端': - '介绍': 'interfaces/index.md' - '命令行客户端接口': 'interfaces/cli.md' - - 'HTTP 客户端接口': 'interfaces/http_interface.md' - - 'JDBC 驱动': 'interfaces/jdbc.md' - '原生客户端接口 (TCP)': 'interfaces/tcp.md' - - '第三方开发的库': 'interfaces/third-party_client_libraries.md' - - '第三方开发的可视化界面': 'interfaces/third-party_gui.md' + - 'HTTP 客户端接口': 'interfaces/http.md' - '输入输出格式': 'interfaces/formats.md' + - 'JDBC 驱动': 'interfaces/jdbc.md' + - 'ODBC 驱动': 'interfaces/odbc.md' + - '第三方': + - '客户端库': 'interfaces/third-party/client_libraries.md' + - '集成': 'interfaces/third-party/integrations.md' + - '可视界面': 'interfaces/third-party/gui.md' - '数据类型': - '介绍': 'data_types/index.md' @@ -60,34 +63,34 @@ nav: - 'Other kinds of queries': 'query_language/misc.md' - 'Functions': - 'Introduction': 'query_language/functions/index.md' - - 'Arithmetic functions': 'query_language/functions/arithmetic_functions.md' - - 'Comparison functions': 'query_language/functions/comparison_functions.md' - - 'Logical functions': 'query_language/functions/logical_functions.md' - - 'Type conversion functions': 'query_language/functions/type_conversion_functions.md' - - 'Functions for working with dates and times': 'query_language/functions/date_time_functions.md' - - 'Functions for working with strings': 'query_language/functions/string_functions.md' - - 'Functions for searching strings': 'query_language/functions/string_search_functions.md' - - 'Functions for searching and replacing in strings': 'query_language/functions/string_replace_functions.md' - - 'Conditional functions': 'query_language/functions/conditional_functions.md' - - 'Mathematical functions': 'query_language/functions/math_functions.md' - - 'Rounding functions': 'query_language/functions/rounding_functions.md' - - 'Functions for working with arrays': 'query_language/functions/array_functions.md' - - 'Functions for splitting and merging strings and arrays': 'query_language/functions/splitting_merging_functions.md' - - 'Bit functions': 'query_language/functions/bit_functions.md' - - 'Hash functions': 'query_language/functions/hash_functions.md' - - 'Functions for generating pseudo-random numbers': 'query_language/functions/random_functions.md' - - 'Encoding functions': 'query_language/functions/encoding_functions.md' - - 'Functions for working with URLs': 'query_language/functions/url_functions.md' - - 'Functions for working with IP addresses': 'query_language/functions/ip_address_functions.md' - - 'Functions for working with JSON.': 'query_language/functions/json_functions.md' - - 'Higher-order functions': 'query_language/functions/higher_order_functions.md' - - 'Other functions': 'query_language/functions/other_functions.md' - - 'Functions for working with external dictionaries': 'query_language/functions/ext_dict_functions.md' - - 'Functions for working with Yandex.Metrica dictionaries': 'query_language/functions/ym_dict_functions.md' - - 'Functions for implementing the IN operator': 'query_language/functions/in_functions.md' - - 'arrayJoin function': 'query_language/functions/array_join.md' - - 'Functions for working with geographical coordinates': 'query_language/functions/geo.md' - - 'Functions for working with Nullable arguments': 'query_language/functions/functions_for_nulls.md' + - 'Arithmetic': 'query_language/functions/arithmetic_functions.md' + - 'Comparison': 'query_language/functions/comparison_functions.md' + - 'Logical': 'query_language/functions/logical_functions.md' + - 'Type Conversion': 'query_language/functions/type_conversion_functions.md' + - 'Working with Dates and Times': 'query_language/functions/date_time_functions.md' + - 'Working with strings': 'query_language/functions/string_functions.md' + - 'For Searching Strings': 'query_language/functions/string_search_functions.md' + - 'For Replacing in Strings': 'query_language/functions/string_replace_functions.md' + - 'Conditional ': 'query_language/functions/conditional_functions.md' + - 'Mathematical': 'query_language/functions/math_functions.md' + - 'Rounding': 'query_language/functions/rounding_functions.md' + - 'Working with Arrays': 'query_language/functions/array_functions.md' + - 'Splitting and Merging Strings and Arrays': 'query_language/functions/splitting_merging_functions.md' + - 'Bit': 'query_language/functions/bit_functions.md' + - 'Hash': 'query_language/functions/hash_functions.md' + - 'Generating Pseudo-Random Numbers': 'query_language/functions/random_functions.md' + - 'Encoding': 'query_language/functions/encoding_functions.md' + - 'Working with URLs': 'query_language/functions/url_functions.md' + - 'Working with IP Addresses': 'query_language/functions/ip_address_functions.md' + - 'Working with JSON.': 'query_language/functions/json_functions.md' + - 'Higher-Order': 'query_language/functions/higher_order_functions.md' + - 'Working with External Dictionaries': 'query_language/functions/ext_dict_functions.md' + - 'Working with Yandex.Metrica Dictionaries': 'query_language/functions/ym_dict_functions.md' + - 'Implementing the IN Operator': 'query_language/functions/in_functions.md' + - 'arrayJoin': 'query_language/functions/array_join.md' + - 'Working with geographical coordinates': 'query_language/functions/geo.md' + - 'Working with Nullable arguments': 'query_language/functions/functions_for_nulls.md' + - 'Other': 'query_language/functions/other_functions.md' - 'Aggregate functions': - 'Introduction': 'query_language/agg_functions/index.md' - 'Function reference': 'query_language/agg_functions/reference.md' diff --git a/docs/tools/concatenate.py b/docs/tools/concatenate.py index 6fd581f5f4c..ffc49a7fed9 100755 --- a/docs/tools/concatenate.py +++ b/docs/tools/concatenate.py @@ -44,17 +44,15 @@ def concatenate(lang, docs_path, single_page_file): # function is passed into re.sub() to process links def link_proc(matchObj): - text, link = matchObj.group().strip('[)').split('](') - if link.startswith('http') or '.jpeg' in link or '.jpg' in link or '.png' in link or '.gif' in link: + text, link = matchObj.group().strip('[)').split('](', 1) + if link.startswith('http:') or link.startswith('https:') or '.jpeg' in link or '.jpg' in link or '.png' in link or '.gif' in link: return '[' + text + '](' + link + ')' else: sharp_pos = link.find('#') if sharp_pos > -1: return '[' + text + '](' + link[sharp_pos:] + ')' else: - raise RuntimeError( - 'ERROR: Link [' + text + '](' + link + ') in file ' + - path + ' has no anchor. Please provide it.') + return '[' + text + '](#' + link.replace('../', '').replace('/index.md', '').replace('.md', '') + ')' for l in f: # Processing links in a string diff --git a/docs/zh/interfaces/http_interface.md b/docs/zh/interfaces/http.md similarity index 100% rename from docs/zh/interfaces/http_interface.md rename to docs/zh/interfaces/http.md diff --git a/docs/zh/interfaces/index.md b/docs/zh/interfaces/index.md index b5603f81e6f..5334ee2d400 100644 --- a/docs/zh/interfaces/index.md +++ b/docs/zh/interfaces/index.md @@ -2,8 +2,19 @@ # 客户端 -为了探索 ClickHouse 的能力，如导入数据到表中，或做一些手动的查询，可以使用 clickhouse-client 命令行程序来完成 +ClickHouse提供了两个网络接口（两者都可以选择包装在TLS中以提高安全性）： +* [HTTP](http.md)，记录在案，易于使用. +* [本地人TCP](tcp.md)，这有较少的开销. +在大多数情况下，建议使用适当的工具或库，而不是直接与这些工具或库进行交互。 Yandex的官方支持如下： +* [命令行客户端](cli.md) +* [JDBC驱动程序](jdbc.md) +* [ODBC驱动程序](odbc.md) + +还有许多第三方库可供使用ClickHouse： +* [客户端库](third-party/client_libraries.md) +* [集成](third-party/integrations.md) +* [可视界面](third-party/gui.md) [来源文章](https://clickhouse.yandex/docs/zh/interfaces/) diff --git a/docs/zh/interfaces/odbc.md b/docs/zh/interfaces/odbc.md new file mode 100644 index 00000000000..120201bcc7c --- /dev/null +++ b/docs/zh/interfaces/odbc.md @@ -0,0 +1,5 @@ +# ODBC 驱动 + +- ClickHouse官方有 JDBC 的驱动。 见[这里](https://github.com/yandex/clickhouse-jdbc)。 + +[来源文章](https://clickhouse.yandex/docs/zh/interfaces/odbc/) diff --git a/docs/zh/interfaces/tcp.md b/docs/zh/interfaces/tcp.md index 742e252a25f..c60fc2e09aa 100644 --- a/docs/zh/interfaces/tcp.md +++ b/docs/zh/interfaces/tcp.md @@ -1,6 +1,5 @@ # 原生客户端接口（TCP） -TCP 原生接口用于 `clickhouse-client` 命令行，它可以在分布式查询执行中和服务器进行交互，并且可以用在 C++ 程序中。我们讲解只覆盖命令行客户端。 - +本机协议用于[命令行客户端](cli.md)，用于分布式查询处理期间的服务器间通信，以及其他C ++程序。 不幸的是，本机ClickHouse协议还没有正式的规范，但它可以从ClickHouse源代码进行逆向工程[从这里开始](https://github.com/yandex/ClickHouse/tree/master/dbms/src/Client)）和/或拦截和分析TCP流量。 [来源文章](https://clickhouse.yandex/docs/zh/interfaces/tcp/) diff --git a/docs/zh/interfaces/third-party_client_libraries.md b/docs/zh/interfaces/third-party/client_libraries.md similarity index 85% rename from docs/zh/interfaces/third-party_client_libraries.md rename to docs/zh/interfaces/third-party/client_libraries.md index c3cabeaca80..f0a4eba2ba3 100644 --- a/docs/zh/interfaces/third-party_client_libraries.md +++ b/docs/zh/interfaces/third-party/client_libraries.md @@ -1,10 +1,10 @@ # 第三方开发的库 -以下都是适用于 ClickHouse 的第三方库： +!!! warning "放弃" + Yandex不维护下面列出的库，也没有进行任何广泛的测试以确保其质量。 - Python - [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm) - - [sqlalchemy-clickhouse](https://github.com/cloudflare/sqlalchemy-clickhouse) - [clickhouse-driver](https://github.com/mymarilyn/clickhouse-driver) - [clickhouse-client](https://github.com/yurial/clickhouse-client) - PHP @@ -29,21 +29,21 @@ - R - [clickhouse-r](https://github.com/hannesmuehleisen/clickhouse-r) - [RClickhouse](https://github.com/IMSMWU/RClickhouse) +- Java + - [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java) - Scala - [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client) -- .NET +- Kotlin + - [AORM](https://github.com/TanVD/AORM) +- C# - [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net) - [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net) - - [ClickHouse.Net.Migrations](https://github.com/ilyabreev/ClickHouse.Net.Migrations) - C++ - [clickhouse-cpp](https://github.com/artpaul/clickhouse-cpp/) - Elixir - [clickhousex](https://github.com/appodeal/clickhousex/) - - [clickhouse_ecto](https://github.com/appodeal/clickhouse_ecto) -- Java - - [clickhouse-client-java](https://github.com/VirtusAI/clickhouse-client-java) - Nim - [nim-clickhouse](https://github.com/leonardoce/nim-clickhouse) -[来源文章](https://clickhouse.yandex/docs/zh/interfaces/third-party_client_libraries/) +[来源文章](https://clickhouse.yandex/docs/zh/interfaces/third-party/client_libraries/) diff --git a/docs/zh/interfaces/third-party_gui.md b/docs/zh/interfaces/third-party/gui.md similarity index 100% rename from docs/zh/interfaces/third-party_gui.md rename to docs/zh/interfaces/third-party/gui.md diff --git a/docs/zh/interfaces/third-party/integrations.md b/docs/zh/interfaces/third-party/integrations.md new file mode 100644 index 00000000000..9b33f455b09 --- /dev/null +++ b/docs/zh/interfaces/third-party/integrations.md @@ -0,0 +1,25 @@ +# 第三方集成库 + +!!! warning "放弃" + Yandex不维护下面列出的库，也没有进行任何广泛的测试以确保其质量。 + +- Python + - [SQLAlchemy](https://www.sqlalchemy.org) + - [sqlalchemy-clickhouse](https://github.com/cloudflare/sqlalchemy-clickhouse) (uses [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm)) +- Java + - [Hadoop](http://hadoop.apache.org) + - [clickhouse-hdfs-loader](https://github.com/jaykelin/clickhouse-hdfs-loader) (uses [JDBC](../jdbc.md)) +- Scala + - [Akka](https://akka.io) + - [clickhouse-scala-client](https://github.com/crobox/clickhouse-scala-client) +- C# + - [ADO.NET](https://docs.microsoft.com/en-us/dotnet/framework/data/adonet/ado-net-overview) + - [ClickHouse.Ado](https://github.com/killwort/ClickHouse-Net) + - [ClickHouse.Net](https://github.com/ilyabreev/ClickHouse.Net) + - [ClickHouse.Net.Migrations](https://github.com/ilyabreev/ClickHouse.Net.Migrations) +- Elixir + - [Ecto](https://github.com/elixir-ecto/ecto) + - [clickhouse_ecto](https://github.com/appodeal/clickhouse_ecto) + + +[来源文章](https://clickhouse.yandex/docs/zh/interfaces/third-party/integrations/) diff --git a/docs/zh/introduction/features_considered_disadvantages.md b/docs/zh/introduction/features_considered_disadvantages.md deleted file mode 120000 index 45d3cdf563a..00000000000 --- a/docs/zh/introduction/features_considered_disadvantages.md +++ /dev/null @@ -1 +0,0 @@ -../../en/introduction/features_considered_disadvantages.md \ No newline at end of file diff --git a/docs/zh/introduction/features_considered_disadvantages.md b/docs/zh/introduction/features_considered_disadvantages.md new file mode 100644 index 00000000000..e5cd51ebdcd --- /dev/null +++ b/docs/zh/introduction/features_considered_disadvantages.md @@ -0,0 +1,7 @@ +# ClickHouse可以考虑缺点的功能 + +1. 没有完整的交易。 +2. 缺乏以高速率和低延迟修改或删除已插入数据的能力。 有批次删除和更新可用于清理或修改数据，例如符合[GDPR](https://gdpr-info.eu)。 +3. 稀疏索引使得ClickHouse不适合通过其键检索单行的点查询。 + +[来源文章](https://clickhouse.yandex/docs/zh/introduction/features_considered_disadvantages/) diff --git a/website/index.html b/website/index.html index fffeed2e211..048b46f60e4 100644 --- a/website/index.html +++ b/website/index.html @@ -31,6 +31,7 @@ Quick Start Performance Documentation + Blog Contacts @@ -90,11 +91,6 @@
-
-
- Upcoming meetup in Amsterdam on November 15 -
-

ClickHouse. Just makes you think faster.

@@ -316,6 +312,8 @@ rel="external nofollow" target="_blank">ClickHouse for Experimentation at Spotify
  • Migrating to Yandex ClickHouse by LifeStreet (machine translation from Russian)
    • +
  • ClickHouse at ContentSquare (machine translation from French)
  • How to start ClickHouse up and win the jackpot by SMI2 (machine translation from Russian)
  • Follow official Twitter account.
    • +
  • Or email Yandex ClickHouse team directly at + turn on JavaScript to see email address. + You can also fill this form to meet us in person.
    • -

    Or email ClickHouse team at Yandex directly: - turn on JavaScript to see email address, - for example if you are interested in commercial support.

    - -

    Friendly reminder: check out the documentation in English or Russian first — maybe your question is already covered. +

    Friendly reminder: check out the documentation in English, Russian, Chinese or Farsi first — maybe your question is already covered.

    Like ClickHouse?

    @@ -452,6 +449,9 @@ clickhouse-client Twitter and LinkedIn!

    +

    Also hosting ClickHouse Meetups is very appreciated, fill this form + if you are interested and we'll get in touch. + Short reports about previous meetups are published in official ClickHouse blog.